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

Bugfixes / Rework of save discovery system

Browse Source
This commit is contained in:
Anuken
2019-10-27 14:58:26 -04:00
parent d969741f90
commit e103d62b75
12 changed files with 99 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -182,7 +182,7 @@ public class DesktopInput extends InputHandler{
mode = none;
}
if(mode != none || isPlacing()){
if(mode == placing || isPlacing()){
selectRequests.clear();
lastSchematic = null;
}
@@ -379,7 +379,7 @@ public class DesktopInput extends InputHandler{
deleting = true;
}else if(selected != null){
//only begin shooting if there's no cursor event
if(!tileTapped(selected) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && player.buildQueue().size == 0 && !droppingItem &&
if(!tileTapped(selected) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && (player.buildQueue().size == 0 || !player.isBuilding) && !droppingItem &&
!tryBeginMine(selected) && player.getMineTile() == null && !ui.chatfrag.chatOpen()){
player.isShooting = true;
}