残弾がマガジンサイズ以下のときのリロードバグ修正

SpaceServerUniverse · Oct 19, 2024 · fb3e10d · fb3e10d
1 parent 5db92f0
commit fb3e10d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/core/GunStatus.java b/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/core/GunStatus.java
@@ -64,12 +64,13 @@ public boolean startReload(int reloadTime, Player player) throws UserNotFoundExc
 
     public void finishReload(Player player) throws UserNotFoundException, AmmoNotFoundException {
         this.isReloading = false;
-        connector.setAmmoFromUserId(player, gun.getType(), getInventoryAmmo(player) + magazineAmmo);
-        if(this.inventoryAmmo <= gun.getMagazineSize()){
-            this.magazineAmmo = (int) this.inventoryAmmo;
+        long nowAllAmmo = getInventoryAmmo(player) + (long)magazineAmmo;
+        connector.setAmmoFromUserId(player, gun.getType(), nowAllAmmo);
+        if(nowAllAmmo <= gun.getMagazineSize()){
+            this.magazineAmmo = (int) nowAllAmmo;
             setInventoryAmmo(player, 0);
         } else {
-            setInventoryAmmo(player, this.inventoryAmmo - (gun.getMagazineSize() - magazineAmmo));
+            setInventoryAmmo(player, nowAllAmmo - (long)(gun.getMagazineSize()));
             this.magazineAmmo = gun.getMagazineSize();
         }
     }