fix: previous commit introduced ANOTHER crash

leia-uwu · Sep 12, 2024 · 339a2cf · 339a2cf
1 parent 7e79afc
commit 339a2cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/server/src/game/objects/player.ts b/server/src/game/objects/player.ts
@@ -664,7 +664,6 @@ export class Player extends BaseGameObject {
         }
         this.role = role;
         this.inventoryDirty = true;
-        this.weapsDirty = true;
         this.setDirty();
     }
 
@@ -2714,11 +2713,11 @@ export class Player extends BaseGameObject {
                                 if (throwableList.includes(obj.type)) {
                                     // fill empty slot with throwable, otherwise just add to inv
                                     if (this.inventory[obj.type] == 0) {
-                                        this.weapons[
-                                            GameConfig.WeaponSlot.Throwable
-                                        ].type = obj.type;
-                                        this.weapsDirty = true;
-                                        this.setDirty();
+                                        this.weaponManager.setWeapon(
+                                            GameConfig.WeaponSlot.Throwable,
+                                            obj.type,
+                                            0,
+                                        );
                                     }
                                 }
                                 break;

diff --git a/server/src/game/weaponManager.ts b/server/src/game/weaponManager.ts
@@ -133,11 +133,16 @@ export class WeaponManager {
 
     setWeapon(idx: number, type: string, ammo: number) {
         const weaponDef = GameObjectDefs[type];
-        assert(
-            weaponDef.type === "gun" ||
-                weaponDef.type === "melee" ||
-                weaponDef.type === "throwable",
-        );
+        const isMelee = idx === GameConfig.WeaponSlot.Melee;
+
+        // non melee weapons can be set to empty strings to clear the slot
+        if (!isMelee && type !== "") {
+            assert(
+                weaponDef.type === "gun" ||
+                    weaponDef.type === "melee" ||
+                    weaponDef.type === "throwable",
+            );
+        }
 
         // attempt to fix mysterious crash with active weapon being undefined
         if (idx === GameConfig.WeaponSlot.Melee && !type) {
@@ -147,7 +152,7 @@ export class WeaponManager {
         this.weapons[idx].type = type;
         this.weapons[idx].cooldown = 0;
         this.weapons[idx].ammo = ammo;
-        if (weaponDef.type === "gun") {
+        if (weaponDef?.type === "gun") {
             this.weapons[idx].recoilTime = weaponDef.recoilTime;
         }