fix block overriding

src/content/ContentLoader.cpp

@@ -220,11 +220,11 @@ void ContentLoader::loadBlock(
     }
 
     // block model
-    std::string modelTypeName;
+    std::string modelTypeName = to_string(def.model);
     root.at("model").get(modelTypeName);
     root.at("model-name").get(def.modelName);
     if (auto model = BlockModel_from(modelTypeName)) {
-        if (*model == BlockModel::custom) {
+        if (*model == BlockModel::custom && def.customModelRaw == nullptr) {
             if (root.has("model-primitives")) {
                 def.customModelRaw = root["model-primitives"];
             } else if (def.modelName.empty()) {
@@ -246,7 +246,7 @@ void ContentLoader::loadBlock(
     root.at("material").get(def.material);
 
     // rotation profile
-    std::string profile = "none";
+    std::string profile = def.rotations.name;
     root.at("rotation").get(profile);
 
     def.rotatable = profile != "none";
@@ -285,8 +285,6 @@ void ContentLoader::loadBlock(
         );
         aabb.b += aabb.a;
         def.hitboxes = {aabb};
-    } else {
-        def.hitboxes = {AABB()};
     }
 
     // block light emission [r, g, b] where r,g,b in range [0..15]