mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-30 14:39:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #5548

Browse Source
This commit is contained in:
Anuken
2021-07-06 16:32:42 -04:00
parent 017552f573
commit 0ba26b22c0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
View File

@ -98,7 +98,7 @@ public class AssetsProcess extends BaseProcessor{
}); });
for(Element elem : elements){ 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(); String fname = field.getSimpleName().toString();
if(fname.startsWith("default")){ if(fname.startsWith("default")){
loadStyles.addStatement("arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")"); 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(); String name = p.nameWithoutExtension();
if(names.contains(name)){ if(names.contains(name)){
BaseProcessor.err("Duplicate file name: " + p.toString() + "!"); BaseProcessor.err("Duplicate file name: " + p + "!");
}else{ }else{
names.add(name); names.add(name);
} }

2
core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@ -85,7 +85,7 @@ public class LiquidTurret extends Turret{
@Override @Override
public boolean shouldActiveSound(){ public boolean shouldActiveSound(){
return wasShooting; return wasShooting && enabled;
} }
@Override @Override