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

Crash fix

Browse Source
This commit is contained in:
Anuken
2018-07-02 19:29:11 -04:00
parent 44f13ef162
commit 11b979e408
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
View File

@@ -219,16 +219,22 @@ public interface BuilderTrait {
/**Draw placement effects for an entity. This includes mining*/ /**Draw placement effects for an entity. This includes mining*/
default void drawBuilding(Unit unit){ default void drawBuilding(Unit unit){
if(!isBuilding()){ BuildRequest request;
if(getMineTile() != null){
drawMining(unit); synchronized (getPlaceQueue()) {
if (!isBuilding()) {
if (getMineTile() != null) {
drawMining(unit);
}
return;
} }
return;
request = getCurrentRequest();
} }
Tile tile = world.tile(getCurrentRequest().x, getCurrentRequest().y); Tile tile = world.tile(request.x, request.y);
Draw.color(unit.distanceTo(tile) > placeDistance || getCurrentRequest().remove ? Palette.remove : Palette.accent); Draw.color(unit.distanceTo(tile) > placeDistance || request.remove ? Palette.remove : Palette.accent);
float focusLen = 3.8f + Mathf.absin(Timers.time(), 1.1f, 0.6f); float focusLen = 3.8f + Mathf.absin(Timers.time(), 1.1f, 0.6f);
float px = unit.x + Angles.trnsx(unit.rotation, focusLen); float px = unit.x + Angles.trnsx(unit.rotation, focusLen);
float py = unit.y + Angles.trnsy(unit.rotation, focusLen); float py = unit.y + Angles.trnsy(unit.rotation, focusLen);
@@ -268,6 +274,8 @@ public interface BuilderTrait {
default void drawMining(Unit unit){ default void drawMining(Unit unit){
Tile tile = getMineTile(); Tile tile = getMineTile();
if(tile == null) return;
float focusLen = 4f + Mathf.absin(Timers.time(), 1.1f, 0.5f); float focusLen = 4f + Mathf.absin(Timers.time(), 1.1f, 0.5f);
float swingScl = 12f, swingMag = tilesize/8f; float swingScl = 12f, swingMag = tilesize/8f;
float flashScl = 0.3f; float flashScl = 0.3f;