From 357fc37a7939a4575474378db44632bc8c7b1d82 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 22 Mar 2018 19:21:35 -0400
Subject: [PATCH] Fixed teleporter crash and color switch bug

---
 core/assets/version.properties                       |  4 ++--
 core/src/io/anuke/mindustry/core/Control.java        |  2 --
 core/src/io/anuke/mindustry/input/InputHandler.java  | 12 ++++++++----
 .../world/blocks/types/distribution/Teleporter.java  |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index e93cff41a6..498cceb537 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Tue Mar 20 18:38:05 EDT 2018
+#Thu Mar 22 19:20:28 EDT 2018
 version=release
-androidBuildCode=455
+androidBuildCode=456
 name=Mindustry
 code=3.4
 build=custom build
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 29040420b2..317c3d9c31 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -122,8 +122,6 @@ public class Control extends Module{
 			"lastBuild", 0
 		);
 
-		Log.info("{0}", (int)'ї');
-
 		KeyBinds.load();
 
 		for(Map map : world.maps().list()){
diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java
index 88ef529f4e..a53e6d15c6 100644
--- a/core/src/io/anuke/mindustry/input/InputHandler.java
+++ b/core/src/io/anuke/mindustry/input/InputHandler.java
@@ -115,19 +115,23 @@ public abstract class InputHandler extends InputAdapter{
 	}
 	
 	public void placeBlock(int x, int y, Block result, int rotation, boolean effects, boolean sound){
-		if(!Net.client()){
+		if(!Net.client()){ //is server or singleplayer
 			Placement.placeBlock(x, y, result, rotation, effects, sound);
-			Tile tile = world.tile(x, y);
-			if(tile != null) result.placed(tile);
 		}
 
 		if(Net.active()){
 			NetEvents.handlePlace(x, y, result, rotation);
 		}
+
+		if(!Net.client()){
+			Tile tile = world.tile(x, y);
+			if(tile != null) result.placed(tile);
+		}
 	}
 
 	public void breakBlock(int x, int y, boolean sound){
-		if(!Net.client()) Placement.breakBlock(x, y, true, sound);
+		if(!Net.client())
+			Placement.breakBlock(x, y, true, sound);
 
 		if(Net.active()){
 			NetEvents.handleBreak(x, y);
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 bcce6b3314..880461bd15 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
@@ -69,7 +69,7 @@ public class Teleporter extends PowerBlock{
 	@Override
 	public void placed(Tile tile){
 		tile.<TeleporterEntity>entity().color = lastColor;
-		Timers.run(1f, () -> setConfigure(tile, lastColor));
+		setConfigure(tile, lastColor);
 	}
 	
 	@Override