kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复换弹时物品未正确消耗的问题

Browse source
This commit is contained in:
Light_Quanta 2025-04-14 17:01:42 +08:00
parent 4822382dc7
commit 9c2c02f07c
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
View file

@ -354,7 +354,7 @@ public class GunEventHandler {
case ITEM -> { case ITEM -> {
data.ammo.set(1); data.ammo.set(1);
player.getInventory().clearOrCountMatchingItems( player.getInventory().clearOrCountMatchingItems(
p -> p.getItem().getDescriptionId().equals(ammoTypeInfo.value()), p -> p.getItem().toString().equals(ammoTypeInfo.value()),
1, 1,
player.inventoryMenu.getCraftSlots() player.inventoryMenu.getCraftSlots()
); );
@ -606,7 +606,7 @@ public class GunEventHandler {
type.add(cap, -1); type.add(cap, -1);
} }
case ITEM -> player.getInventory().clearOrCountMatchingItems( case ITEM -> player.getInventory().clearOrCountMatchingItems(
p -> p.getItem().getDescriptionId().equals(ammoTypeInfo.value()), p -> p.getItem().toString().equals(ammoTypeInfo.value()),
1, 1,
player.inventoryMenu.getCraftSlots() player.inventoryMenu.getCraftSlots()
); );

2
src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java
View file

@ -126,7 +126,7 @@ public class PlayerEventHandler {
if (data.ammo.get() == 0 && data.maxAmmo.get() == 0) { if (data.ammo.get() == 0 && data.maxAmmo.get() == 0) {
data.ammo.set(1); data.ammo.set(1);
player.getInventory().clearOrCountMatchingItems( player.getInventory().clearOrCountMatchingItems(
p -> p.getItem().getDescriptionId().equals(ammoTypeInfo.value()), p -> p.getItem().toString().equals(ammoTypeInfo.value()),
1, 1,
player.inventoryMenu.getCraftSlots() player.inventoryMenu.getCraftSlots()
); );