mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-20 12:58:38 +03:00
Cleanup
This commit is contained in:
parent
887ce28fc2
commit
12843af977
Binary file not shown.
@ -151,7 +151,7 @@ public class StatusEffects implements ContentList{
|
|||||||
boss = new StatusEffect("boss"){{
|
boss = new StatusEffect("boss"){{
|
||||||
color = Pal.health;
|
color = Pal.health;
|
||||||
permanent = true;
|
permanent = true;
|
||||||
damageMultiplier = 1.5f;
|
damageMultiplier = 1.3f;
|
||||||
healthMultiplier = 1.5f;
|
healthMultiplier = 1.5f;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ public class Drawf{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static boolean allowLight(Team team){
|
private static boolean allowLight(Team team){
|
||||||
return team == Team.derelict || team == Vars.player.team() || state.rules.enemyLights;
|
return renderer != null && (team == Team.derelict || team == Vars.player.team() || state.rules.enemyLights);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void selected(Building tile, Color color){
|
public static void selected(Building tile, Color color){
|
||||||
|
@ -77,16 +77,6 @@ public class ModLoadingSound implements Sound{
|
|||||||
sound.stop();
|
sound.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void pause(){
|
|
||||||
sound.pause();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void resume(){
|
|
||||||
sound.resume();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void dispose(){
|
public void dispose(){
|
||||||
sound.dispose();
|
sound.dispose();
|
||||||
|
@ -226,7 +226,7 @@ public class PowerNode extends PowerBlock{
|
|||||||
|
|
||||||
if(otherReq == null || otherReq.block == null) return;
|
if(otherReq == null || otherReq.block == null) return;
|
||||||
|
|
||||||
drawLaser(player.team(), req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy(), size, otherReq.block.size);
|
drawLaser(player == null ? Team.sharded : player.team(), req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy(), size, otherReq.block.size);
|
||||||
}
|
}
|
||||||
Draw.color();
|
Draw.color();
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ public class ServerLauncher implements ApplicationListener{
|
|||||||
String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level1.ordinal()] + " " + text + "&fr");
|
String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level1.ordinal()] + " " + text + "&fr");
|
||||||
System.out.println(result);
|
System.out.println(result);
|
||||||
};
|
};
|
||||||
new HeadlessApplication(new ServerLauncher(), null, throwable -> CrashSender.send(throwable, f -> {}));
|
new HeadlessApplication(new ServerLauncher(), throwable -> CrashSender.send(throwable, f -> {}));
|
||||||
}catch(Throwable t){
|
}catch(Throwable t){
|
||||||
CrashSender.send(t, f -> {});
|
CrashSender.send(t, f -> {});
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ public class ApplicationTests{
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
new HeadlessApplication(core, null, throwable -> exceptionThrown[0] = throwable);
|
new HeadlessApplication(core, throwable -> exceptionThrown[0] = throwable);
|
||||||
|
|
||||||
while(!begins[0]){
|
while(!begins[0]){
|
||||||
if(exceptionThrown[0] != null){
|
if(exceptionThrown[0] != null){
|
||||||
|
Loading…
Reference in New Issue
Block a user