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

Some minor cleanup

Browse Source
This commit is contained in:
Anuken
2019-10-31 18:27:09 -04:00
parent 6746732e49
commit 53248f6e00
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,7 @@ public class DesktopInput extends InputHandler{
mode = none; mode = none;
} }
if(mode == placing || isPlacing()){ if(mode != none || isPlacing()){
selectRequests.clear(); selectRequests.clear();
lastSchematic = null; lastSchematic = null;
} }
@@ -365,7 +365,6 @@ public class DesktopInput extends InputHandler{
if(!selectRequests.isEmpty()){ if(!selectRequests.isEmpty()){
flushRequests(selectRequests); flushRequests(selectRequests);
//selectRequests.clear();
}else if(isPlacing()){ }else if(isPlacing()){
selectX = cursorX; selectX = cursorX;
selectY = cursorY; selectY = cursorY;

6
core/src/io/anuke/mindustry/world/Tile.java
View File

@@ -123,15 +123,15 @@ public class Tile implements Position, TargetTrait{
return block().solid && !block().synthetic() && block().fillsTile; return block().solid && !block().synthetic() && block().fillsTile;
} }
public Floor floor(){ public @NonNull Floor floor(){
return floor; return floor;
} }
public Block block(){ public @NonNull Block block(){
return block; return block;
} }
public Floor overlay(){ public @NonNull Floor overlay(){
return overlay; return overlay;
} }