From c6a1d9880f8d0b32c3399d3f9b7cc848aed271d0 Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:54:34 +1000
Subject: Add DanceDatabase fallback

fixes being crashed when another player uses a modded dance
---
 source/game/StarDanceDatabase.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source/game/StarDanceDatabase.cpp')

diff --git a/source/game/StarDanceDatabase.cpp b/source/game/StarDanceDatabase.cpp
index 3ad2277..2e81fe5 100644
--- a/source/game/StarDanceDatabase.cpp
+++ b/source/game/StarDanceDatabase.cpp
@@ -17,7 +17,12 @@ DanceDatabase::DanceDatabase() {
 }
 
 DancePtr DanceDatabase::getDance(String const& name) const {
-  return m_dances.get(name);
+  if (auto dance = m_dances.ptr(name))
+    return *dance;
+  else {
+    Logger::error("Invalid dance '{}', using default", name);
+    return m_dances.get("assetmissing");
+  }
 }
 
 DancePtr DanceDatabase::readDance(String const& path) {
-- 
cgit v1.2.3