Merge branch 'main' into update-file-subsystem

src/engine/ServerMainloop.cpp

@@ -67,8 +67,11 @@ void ServerMainloop::run() {
 
         if (!coreParams.testMode) {
             auto end = system_clock::now();
-            platform::sleep(targetDelta * 1000 - 
-                duration_cast<microseconds>(end - begin).count() / 1000);
+            int64_t millis = targetDelta * 1000 - 
+                duration_cast<microseconds>(end - begin).count() / 1000;
+            if (millis > 0) {
+                platform::sleep(millis);
+            }
             begin = system_clock::now();
         }
     }

src/graphics/render/BlockWrapsRenderer.cpp

@@ -56,7 +56,10 @@ void BlockWrapsRenderer::draw(const BlockWrapper& wrapper) {
                 );
                 break;
             case BlockModel::aabb: {
-                const auto& aabb = def.rt.hitboxes[vox->state.rotation].at(0);
+                const auto& aabb =
+                    (def.rotatable ? def.rt.hitboxes[vox->state.rotation]
+                                   : def.hitboxes)
+                        .at(0);
                 const auto& size = aabb.size();
                 regions[0].scale(size.z, size.y);
                 regions[1].scale(size.z, size.y);