Merge branch 'v30'

src/client/graphics/layers/PlayerInfoOverlay.ts

@@ -1,8 +1,6 @@
 import { LitElement, TemplateResult, html } from "lit";
-import { ref } from "lit-html/directives/ref.js";
 import { customElement, property, state } from "lit/decorators.js";
 import { assetUrl } from "../../../core/AssetUrls";
-import { renderPlayerFlag } from "../../../core/CustomFlag";
 import { EventBus } from "../../../core/EventBus";
 import {
   PlayerProfile,
@@ -365,21 +363,10 @@ export class PlayerInfoOverlay extends LitElement implements Layer {
             )}"
           >
             ${player.cosmetics.flag
-              ? player.cosmetics.flag!.startsWith("!")
-                ? html`<div
-                    class="h-6 aspect-3/4 player-flag"
-                    ${ref((el) => {
-                      if (el instanceof HTMLElement) {
-                        requestAnimationFrame(() => {
-                          renderPlayerFlag(player.cosmetics.flag!, el);
-                        });
-                      }
-                    })}
-                  ></div>`
-                : html`<img
-                    class="h-6 aspect-3/4"
-                    src=${assetUrl(`flags/${player.cosmetics.flag!}.svg`)}
-                  />`
+              ? html`<img
+                  class="h-6 object-contain"
+                  src=${assetUrl(player.cosmetics.flag!)}
+                />`
               : html``}
             <span>${player.displayName()}</span>
             ${playerTeam !== "" && player.type() !== PlayerType.Bot