From c66fd67510ca83400df79f5dcacf06bf186c72b8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 25 May 2019 21:10:42 -0400
Subject: [PATCH] Fixed #500 / Fixed units not appearing in edited maps

---
 core/src/io/anuke/mindustry/editor/MapEditorDialog.java      | 5 +++--
 .../src/io/anuke/mindustry/entities/traits/BuilderTrait.java | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
index 00cec9c417..57debd5b0e 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
@@ -188,13 +188,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
         });
 
         shown(() -> {
-            //clear units, rules and other unnecessary stuff
-            logic.reset();
+
             saved = true;
             if(!Core.settings.getBool("landscape")) Platform.instance.beginForceLandscape();
             editor.clearOp();
             Core.scene.setScrollFocus(view);
             if(!shownWithMap){
+                //clear units, rules and other unnecessary stuff
+                logic.reset();
                 state.rules = new Rules();
                 editor.beginEdit(200, 200);
             }
diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
index 7787b834c1..d4d0e47560 100644
--- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
@@ -165,7 +165,7 @@ public interface BuilderTrait extends Entity, TeamTrait{
             output.writeInt(Pos.get(request.x, request.y));
             output.writeFloat(request.progress);
             if(!request.breaking){
-                output.writeByte(request.block.id);
+                output.writeShort(request.block.id);
                 output.writeByte(request.rotation);
             }
         }else{
@@ -189,7 +189,7 @@ public interface BuilderTrait extends Entity, TeamTrait{
             if(type == 1){ //remove
                 request = new BuildRequest(Pos.x(position), Pos.y(position));
             }else{ //place
-                byte block = input.readByte();
+                short block = input.readShort();
                 byte rotation = input.readByte();
                 request = new BuildRequest(Pos.x(position), Pos.y(position), rotation, content.block(block));
             }