finally fixed the stupid bug

sayterdarkwynd · Jan 12, 2020 · dca9f95 · dca9f95
1 parent 25bdc10
commit dca9f95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/items/active/weapons/ranged/gunfire.lua b/items/active/weapons/ranged/gunfire.lua
@@ -316,9 +316,6 @@ function GunFire:uninit()
 	  self.helper:clearPersistent()
 	end
 	status.clearPersistentEffects("weaponBonus") --clear bonuses
-    if (self.isAmmoBased == 1) then
-      world.sendEntityMessage(self.playerId,"removeBar","ammoBar")   --clear ammo bar  
-    end	
 end
 
 function GunFire:isResetting()

diff --git a/items/active/weapons/ranged/gunfirefixed.lua b/items/active/weapons/ranged/gunfirefixed.lua
@@ -370,10 +370,7 @@ function GunFireFixed:damagePerShot()
 end
 
 function GunFireFixed:uninit()
-  status.clearPersistentEffects("weaponBonus")
-    if (self.isAmmoBased == 1) then
-      world.sendEntityMessage(self.playerId,"removeBar","ammoBar")   --clear ammo bar  
-    end  
+  status.clearPersistentEffects("weaponBonus") 
 end
 
 function GunFireFixed:isResetting()

diff --git a/stats/player_primary_bars.lua b/stats/player_primary_bars.lua
@@ -11,9 +11,20 @@ function init()
 		if not l then return end
 		removeBar(barName)
     end)
-
+
+    self.timerRemoveAmmoBar = 0
 end
 
+function update(dt)
+    if self.timerRemoveAmmoBar > 10 then
+      world.sendEntityMessage(entity.id(),"removeBar","ammoBar")   --clear ammo bar  
+      self.timerRemoveAmmoBar = 0
+    else
+      self.timerRemoveAmmoBar = self.timerRemoveAmmoBar + dt
+    end 
+end
+
+
 function overheadBars()
 
   local bars = {}