Merge remote-tracking branch 'origin/master'

2022-08-23 09:10:20 -04:00
parent ebf2094950 f0300dcdde
commit 1dc910afe9
4 changed files with 229 additions and 228 deletions
--- a/core/src/mindustry/entities/comp/WeaponsComp.java
+++ b/core/src/mindustry/entities/comp/WeaponsComp.java
@@ -82,7 +82,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
    @Override
    public void remove(){
        for(WeaponMount mount : mounts){
-            if(mount.bullet != null && mount.bullet.owner == self()){
+            if(mount.weapon.continuous && mount.bullet != null && mount.bullet.owner == self()){
                mount.bullet.time = mount.bullet.lifetime - 10f;
                mount.bullet = null;
            }