diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 989ff3508..c2420e95d 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -787,9 +787,7 @@ public class InventoryMenu : MonoBehaviour .Aetheria() .Current .Entity - .LatestAsync() - .GetAwaiter() - .GetResult(); + .Latest(); } catch (Exception ex) { @@ -807,9 +805,7 @@ public class InventoryMenu : MonoBehaviour return ResolveClient() .Aetheria() .StationRefit - .LatestAsync() - .GetAwaiter() - .GetResult(); + .Latest(); } catch (Exception ex) { @@ -828,9 +824,7 @@ public class InventoryMenu : MonoBehaviour .Aetheria() .Current .Docking - .LatestAsync() - .GetAwaiter() - .GetResult(); + .Latest(); } catch (Exception ex) { diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index b772f5731..45f9055ce 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -1139,9 +1139,7 @@ private void Update() .Aetheria() .Current .Entity - .LatestAsync() - .GetAwaiter() - .GetResult() + .Latest() ?.EntityKey ?? ""; } catch (Exception ex) @@ -1194,9 +1192,7 @@ private void Update() .Aetheria() .Current .Docking - .LatestAsync() - .GetAwaiter() - .GetResult(); + .Latest(); } catch (Exception ex) { @@ -1214,9 +1210,7 @@ private void Update() return ResolveClient() .Aetheria() .StationRefit - .LatestAsync() - .GetAwaiter() - .GetResult(); + .Latest(); } catch (Exception ex) { diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index 63e784dcc..daea2aca2 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -43,6 +43,11 @@ namespace GameCult.Aetheria.State.Verse return _handle.LatestAsync(); } + public TDocument Latest() + { + return _handle.LatestAsync().ConfigureAwait(false).GetAwaiter().GetResult(); + } + public Observable Watch() { return _handle.Watch(); @@ -245,6 +250,12 @@ namespace GameCult.Aetheria.State.Verse return Document().LatestAsync(); } + public TDocument Latest() + where TDocument : class + { + return Document().Latest(); + } + public Observable Watch() where TDocument : class {