diff --git a/core/assets-raw/sprites/blocks/fluxpump.png b/core/assets-raw/sprites/blocks/fluxpump.png index 042ee86214..3ed76c6a32 100644 Binary files a/core/assets-raw/sprites/blocks/fluxpump.png and b/core/assets-raw/sprites/blocks/fluxpump.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 3128bc3c6d..6193c11acd 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index a63e5b6489..8de1b0ac82 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Feb 09 14:51:54 EST 2018 +#Fri Feb 09 22:22:25 EST 2018 version=beta -androidBuildCode=142 +androidBuildCode=143 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 86795a8641..d64876748d 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -215,13 +215,13 @@ public class Control extends Module{ ui.loadfrag.show(); saves.resetSave(); - Timers.runTask(10, ()->{ + Timers.runTask(10, () -> { logic.reset(); world.loadMap(map); logic.play(); }); - Timers.runTask(18, ()-> ui.loadfrag.hide()); + Timers.runTask(18, () -> ui.loadfrag.hide()); } public boolean isHighScore(){ diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index f6bbc5dd44..104c9672d1 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -189,6 +189,10 @@ public abstract class InputHandler extends InputAdapter{ placeBlockInternal(x, y, result, rotation, effects, sound); + Tile tile = world.tile(x, y); + + if(tile != null) result.placed(tile); + if(Net.active() && result != ProductionBlocks.core){ NetEvents.handlePlace(x, y, result, rotation); } @@ -225,8 +229,6 @@ public abstract class InputHandler extends InputAdapter{ } if(effects && sound) Sounds.play("place"); - - result.placed(tile); } public void breakBlock(int x, int y, boolean sound){ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/Door.java index 265ecccddb..5f84c5bb90 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/Door.java @@ -72,7 +72,7 @@ public class Door extends Wall{ for(SolidEntity e : Entities.getNearby(enemyGroup, x * tilesize, y * tilesize, tilesize * 2f)){ Rectangle rect = e.hitbox.getRect(e.x, e.y); - if(rect.overlaps(rect)){ + if(this.rect.overlaps(rect)){ return true; } } @@ -80,7 +80,7 @@ public class Door extends Wall{ for(SolidEntity e : Entities.getNearby(playerGroup, x * tilesize, y * tilesize, tilesize * 2f)){ Rectangle rect = e.hitbox.getRect(e.x, e.y); - if(rect.overlaps(rect)){ + if(this.rect.overlaps(rect)){ return true; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java index 22be5c53cd..bb67cc385d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java @@ -63,6 +63,7 @@ public class Teleporter extends PowerBlock{ @Override public void placed(Tile tile){ tile.entity().color = lastColor; + Timers.run(1f, () -> setConfigure(tile, lastColor)); } @Override