From ed50b462788a5ae74b0d33edbe5e5482fea6348b Mon Sep 17 00:00:00 2001 From: Bob <80072466+bob0005@users.noreply.github.com> Date: Fri, 27 Dec 2024 00:08:10 +0100 Subject: [PATCH] merge into main (#2605) * Fix missing arrival when sending lords & donkeys (#2594) * contracts: fix share points check * contracts: fix share points check * Add resource filter for contributions (#2596) * Add resource filter for contributions * Change % for specific resource contribution * Fix missing donkeys in bridge step 2 (#2598) * Fix missing donkeys in bridge step 2 * fix rerenders * Remove filter * Fix registration delay (#2602) * Fix registration delay * styling * Open popup on load * Add burned donkeys back (#2601) * im (#2604) --------- Co-authored-by: Credence Co-authored-by: Loaf <90423308+ponderingdemocritus@users.noreply.github.com> --- client/src/dojo/setup.ts | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/client/src/dojo/setup.ts b/client/src/dojo/setup.ts index 25d8fbf31..0af269aaa 100644 --- a/client/src/dojo/setup.ts +++ b/client/src/dojo/setup.ts @@ -183,7 +183,28 @@ export async function setup(config: DojoConfig & { state: AppStore }) { configManager.setDojo(components); - setLoading(LoadingStateKey.Events, true); + // setLoading(LoadingStateKey.Events, true); + + await getEvents( + network.toriiClient, + network.contractComponents.events as any, + [], + [], + 20000, + { + Keys: { + keys: [undefined], + pattern_matching: "VariableLen", + models: ["s0_eternum-GameEnded"], + }, + }, + false, + false, + ) + // .finally(() => { + // setLoading(LoadingStateKey.Events, false); + // }); + const eventSync = getEvents( network.toriiClient, network.contractComponents.events as any, @@ -195,7 +216,7 @@ export async function setup(config: DojoConfig & { state: AppStore }) { keys: [undefined], pattern_matching: "VariableLen", models: [ - "s0_eternum-GameEnded", + // "s0_eternum-GameEnded", "s0_eternum-HyperstructureFinished", "s0_eternum-BattleClaimData", "s0_eternum-BattleJoinData",