Merge remote-tracking branch 'origin/master'

core/src/mindustry/ui/fragments/PlayerListFragment.java

@@ -200,7 +200,7 @@ public class PlayerListFragment{
 
                 button.button(Icon.hammer, ustyle,
                     () -> ui.showConfirm("@confirm", Core.bundle.format("confirmvotekick",  user.name()),
-                    () -> Call.sendChatMessage("/votekick " + user.name())))
+                    () -> Call.sendChatMessage("/votekick #" + user.id)))
                 .size(h);
             }
 

core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java

@@ -72,6 +72,11 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
             super.updateTile();
         }
 
+        @Override
+        public boolean canConsume(){
+            return hasCorrectAmmo() && super.canConsume();
+        }
+
         @Override
         public BulletType useAmmo(){
             //does not consume ammo upon firing
@@ -85,7 +90,11 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
 
         @Override
         public boolean hasAmmo(){
-            return ammoTypes.get(liquids.current()) != null && liquids.currentAmount() >= 1f / ammoTypes.get(liquids.current()).ammoMultiplier;
+            return hasCorrectAmmo() && ammoTypes.get(liquids.current()) != null && liquids.currentAmount() >= 1f / ammoTypes.get(liquids.current()).ammoMultiplier;
+        }
+
+        public boolean hasCorrectAmmo(){
+            return !bullets.any() || bullets.first().bullet.type == peekAmmo();
         }
 
         @Override

core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java

@@ -81,6 +81,16 @@ public class ContinuousTurret extends Turret{
 
             if(bullets.any()){
                 for(var entry : bullets){
+                    updateBullet(entry);
+                }
+
+                wasShooting = true;
+                heat = 1f;
+                curRecoil = recoil;
+            }
+        }
+
+        protected void updateBullet(BulletEntry entry){
             float
                 bulletX = x + Angles.trnsx(rotation - 90, shootX + entry.x, shootY + entry.y),
                 bulletY = y + Angles.trnsy(rotation - 90, shootX + entry.x, shootY + entry.y),
@@ -107,12 +117,6 @@ public class ContinuousTurret extends Turret{
             }
         }
 
-                wasShooting = true;
-                heat = 1f;
-                curRecoil = recoil;
-            }
-        }
-
         @Override
         protected void updateReload(){
             //continuous turrets don't have a concept of reload, they are always firing when possible

servers_v7.json

@@ -111,5 +111,9 @@
     {
     "name": "Eradicationdustry",
     "address": ["n1.yeet.ml:6577", "n1.yeet.ml:6576", "n1.yeet.ml:6602", "n1.yeet.ml:6669", "eradicationmindustry.yeet.ml:9547"]
+  },
+    {
+    "name": "AlternightBR",
+    "address": ["mindustry.ga:6567","mindustry.ga:6565","mindustry.ga:7770","mindustry.ga:6564","mindustry.ga:6566"]
     }
 ]