mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-17 23:02:26 -08:00
Code Issues Projects Releases Wiki Activity

bugfixes

Browse source
This commit is contained in:
Anuken 2019-08-17 11:42:15 -04:00
parent 84aff0112d
commit 150491ff2c
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
View file

@ -285,6 +285,10 @@ public interface BuilderTrait extends Entity, TeamTrait{
this.breaking = true;
}
public Tile tile(){
return world.tile(x, y);
}
@Override
public String toString(){
return "BuildRequest{" +

10
core/src/io/anuke/mindustry/entities/type/Player.java
View file

@ -70,7 +70,6 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
private Tile mining;
private Vector2 movement = new Vector2();
private boolean moved;
private SoundLoop buildSound = new SoundLoop(Sounds.build, 0.75f);
//endregion
@ -131,11 +130,6 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
}
}
@Override
public void removed(){
buildSound.stop();
}
@Override
public float drag(){
return mech.drag;
@ -518,7 +512,9 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
}
BuildRequest request = buildRequest();
buildSound.update(request == null ? x : request.x * tilesize, request == null ? y : request.y * tilesize, isBuilding() && (Mathf.within(request.x * tilesize, request.y * tilesize, x, y, placeDistance) || state.isEditor()));
if(isBuilding() && request.tile() != null && (request.tile().withinDst(x, y, placeDistance) || state.isEditor())){
loops.play(Sounds.build, request.tile(), 0.75f);
}
if(isDead()){
isBoosting = false;

2
core/src/io/anuke/mindustry/input/DesktopInput.java
View file

@ -131,7 +131,7 @@ public class DesktopInput extends InputHandler{
player.isShooting = false;
}
if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !ui.chatfrag.chatOpen() && !(scene.getKeyboardFocus() instanceof TextField)){
if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && (scene.getKeyboardFocus() == ui.minimap || !scene.hasDialog()) && !ui.chatfrag.chatOpen() && !(scene.getKeyboardFocus() instanceof TextField)){
if(!ui.minimap.isShown()){
ui.minimap.show();
}else{