Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-10-27 16:05:13 -04:00
parent 101f5351bd
commit d28ae1b304
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/game/MusicControl.java
View File

@@ -22,8 +22,7 @@ public class MusicControl{
public Array<Music> darkMusic = Array.with();
private Music lastRandomPlayed;
private Interval timer = new Interval();
private @Nullable
Music current;
private @Nullable Music current;
private float fade;
private boolean silenced;

2
core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
View File

@@ -114,7 +114,7 @@ public class MechPad extends Block{
MechFactoryEntity entity = tile.entity();
if(entity.player != null){
RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? Mechs.starter : mech));
RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? mech : Mechs.starter));
}
}