Merge optifine/etf-followups into optifine/etf-blocks-glow

crates/horizon-client/src/game/armor_stands.rs

@@ -895,7 +895,7 @@ impl Game<'_> {
                 .emissive
                 .read()
                 .unwrap_or_else(std::sync::PoisonError::into_inner);
-            emissive.overlay(texture).and_then(&uv_of)
+            emissive.overlay(texture).and_then(uv_of)
         };
         let Some(wood) = uv_of("entity/armorstand/armorstand") else {
             return;

crates/horizon-client/src/game/dragon.rs

@@ -2760,7 +2760,7 @@ impl Game<'_> {
             .read()
             .unwrap_or_else(std::sync::PoisonError::into_inner)
             .overlay("entity/enderdragon/dragon")
-            .and_then(&sprite);
+            .and_then(sprite);
         if let Some(glow) = glow.filter(|_| mask.is_none()) {
             let full = horizon_client::mobs::render::FULL_BRIGHT;
             horizon_client::mobs::render::draw(model, base, &poses, glow, color, full, 0, out);