From b616612b07d6238e2ed816d767652faa7dbb0f7c Mon Sep 17 00:00:00 2001
From: kaboom <58372747+kaboombot@users.noreply.github.com>
Date: Fri, 31 Mar 2023 05:00:13 +0300
Subject: [PATCH] WeaponMachineGun: Store updated numFiredBullets

---
 .../kaboom/weapons/modules/weapons/WeaponMachineGun.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java
index 34463cb..0de3bdb 100644
--- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java
+++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java
@@ -110,9 +110,13 @@ public final class WeaponMachineGun implements Listener {
         while (iterator.hasNext()) {
             final Entry<UUID, Integer> entry = iterator.next();
             final UUID playerUUID = entry.getKey();
+            final Player player = Bukkit.getPlayer(playerUUID);
             int numFiredBullets = entry.getValue();
 
-            final Player player = Bukkit.getPlayer(playerUUID);
+            if (player == null) {
+                iterator.remove();
+            }
+
             final Location eyeLocation = player.getEyeLocation();
             final World world = player.getWorld();
             final Vector velocity = eyeLocation.getDirection().multiply(12);
@@ -134,6 +138,7 @@ public final class WeaponMachineGun implements Listener {
             );
 
             numFiredBullets++;
+            machineGunActive.put(playerUUID, numFiredBullets);
 
             if (numFiredBullets >= MAX_BULLET_COUNT) {
                 iterator.remove();