Merged Unit & Builder components / Cleanup

core/src/mindustry/world/blocks/ConstructBlock.java

@@ -179,7 +179,7 @@ public class ConstructBlock extends Block{
                 if(control.input.buildWasAutoPaused && !control.input.isBuilding && player.isBuilder()){
                     control.input.isBuilding = true;
                 }
-                player.builder().addBuild(new BuildPlan(tile.x, tile.y, rotation, cblock, lastConfig), false);
+                player.unit().addBuild(new BuildPlan(tile.x, tile.y, rotation, cblock, lastConfig), false);
             }
         }
 

core/src/mindustry/world/blocks/payloads/Payload.java

@@ -57,6 +57,7 @@ public interface Payload{
             return (T)payload;
         }else if(type == payloadUnit){
             byte id = read.b();
+            if(EntityMapping.map(id) == null) throw new RuntimeException("No type with ID " + id + " found.");
             Unit unit = (Unit)EntityMapping.map(id).get();
             unit.read(read);
             return (T)new UnitPayload(unit);