Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 23:32:43 +00:00
Code Issues Projects Releases Wiki Activity

Weapons/artifacts should not have a count of more than 1

Browse Source
This commit is contained in:
Melledy 2022-05-03 21:08:02 -07:00
parent de75b56d6c
commit ae31e4fd98
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,9 @@ public class Inventory implements Iterable<GameItem> {
if (tab.getSize() >= tab.getMaxCapacity()) { if (tab.getSize() >= tab.getMaxCapacity()) {
return null; return null;
} }
// Duplicates cause problems
item.setCount(Math.max(item.getCount(), 1));
// Adds to inventory
putItem(item, tab); putItem(item, tab);
} else if (type == ItemType.ITEM_VIRTUAL) { } else if (type == ItemType.ITEM_VIRTUAL) {
// Handle // Handle
@ -288,7 +291,11 @@ public class Inventory implements Iterable<GameItem> {
return false; return false;
} }
item.setCount(item.getCount() - count); if (item.getItemData().isEquip()) {
item.setCount(0);
} else {
item.setCount(item.getCount() - count);
}
if (item.getCount() <= 0) { if (item.getCount() <= 0) {
// Remove from inventory tab too // Remove from inventory tab too