From 0ba26b22c083af807756601ed51b762c8fbbd1cb Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 6 Jul 2021 16:32:42 -0400 Subject: [PATCH] Fixed #5548 --- .../main/java/mindustry/annotations/impl/AssetsProcess.java | 4 ++-- .../mindustry/world/blocks/defense/turrets/LiquidTurret.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java index 249f909fd2..0a0538483b 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java @@ -98,7 +98,7 @@ public class AssetsProcess extends BaseProcessor{ }); for(Element elem : elements){ - Seq.with(((TypeElement)elem).getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> { + Seq.with(elem.getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> { String fname = field.getSimpleName().toString(); if(fname.startsWith("default")){ loadStyles.addStatement("arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")"); @@ -124,7 +124,7 @@ public class AssetsProcess extends BaseProcessor{ String name = p.nameWithoutExtension(); if(names.contains(name)){ - BaseProcessor.err("Duplicate file name: " + p.toString() + "!"); + BaseProcessor.err("Duplicate file name: " + p + "!"); }else{ names.add(name); } diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 29ba6b9f77..c03f196367 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -85,7 +85,7 @@ public class LiquidTurret extends Turret{ @Override public boolean shouldActiveSound(){ - return wasShooting; + return wasShooting && enabled; } @Override