From 898a2af4775998f52fe549f9e15f536f87460d6d Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 17 May 2023 09:24:23 -0700 Subject: [PATCH] fixed server crash --- .efrocachemap | 40 +++++++++++----------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/base/base.cc | 4 ++- src/ballistica/core/support/core_config.cc | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 07e74ff9..21e52b19 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4072,26 +4072,26 @@ "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/5c/81/461b88dcd868f050d85aa8ac3bc1", "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/1c/02/97064ab6cd7f4e0018c4e7fa8282", "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/68/b6/f21cabe2df5f604ef02fee02082e", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/18/65/40e80622ed8f38b200538c96fdc1", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/14/dc/1321bd71e3a6068139c052885796", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/80/7d/897c27c5eacdcb62561b3d421138", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2c/ad/b256ac30e7f6540556f68ab5e347", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/10/ed/a428becaabecef1ffbb750e48d44", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/48/1c/3d2e629a6f04bd12b31964351bbf", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d9/de/146c8b7252802da53d778f5f8837", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/20/bc/1692d1e093be536e7d6aca7f2ab1", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/4d/8b/5bee12f728b9ea52a237de933371", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/af/2a/d849d0aeae88a5db9a00ae4b10f0", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/92/73/c9b2466c8289692a0f01d5229191", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7e/88/12be466acafb3a90100705f0affd", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/d8/d1/ecda467579b91ff0b67e66650131", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/73/f4/a75e5f5c59f41cf420e266d0a636", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e8/e8/457b32054c3573283df86add2c82", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6b/92/fcb579d06cc289543de9c5005b24", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/6d/08/adc26cbdc5dc1fed9143c8788d7e", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/9d/49/87ad30cef0e5bb9c84503beef39a", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/55/91/5f48681b8c58b9efd9ab47390ba4", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/72/3d/7a491d84998945d2017aefd2edf6", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/41/6d/f842cd587f2508dd852671c59a0a", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a0/98/42e4aa0c55628368f0565ecb3010", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/20/53/65109947b0f7cb8964ef64b196d1", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/5b/cb/3ec93a5e3106b59721eb8470d9be", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f2/5d/0e58335012318687ee02f333a9f0", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/21/b5/1a64f257cbeb89be58f87063c5a0", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4d/2b/335fd97e4f33311f0ccf78e512c5", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/db/bc/8d436e18d99343cb36efb5028c86", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/2c/85/2b5049e1c9825af8ae704a1a1bf2", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/47/85/37895e099240ce03dd575e842dc0", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/eb/1f/dd7c3a127c4ebe6928b3287e51b1", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c8/9c/aaa3b08e408ff2a4f06ddde322cc", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/08/5e/8a1dfb1d59ceeef8a376198f3a5b", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/7b/84/e568ff95d86920d1a4ea066bbd28", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d6/e2/d27b753748d19510778ffcbf42c3", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c5/43/b510d0cf0402ba01459703a148bc", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/f5/cd/c4b4642ecaf0f39ec9807dd926cf", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0d/33/5ae959faa370108d206f798045a0", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/fb/8c/9e83c45b1b16a11b8a7e16f24abe", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/9c/ae/569686031f7fd7ee964e03998fcb", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/96/3e/36fb95f8f1609a5a0c51cb2c008a", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/66/42/15dadfe1bce99682ea7d36b4e590", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/71/97/7369170323e18f341fc5dcac4370", diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d7ea863..a99ec002 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.20 (build 21017, api 8, 2023-05-16) +### 1.7.20 (build 21018, api 8, 2023-05-17) - This seems like a good time for a `refactoring` release in anticipation of changes coming in 1.8. Basically this means that a lot of things will be diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index ed8596fe..3c2c0c37 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -31,7 +31,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21017 +TARGET_BALLISTICA_BUILD = 21018 TARGET_BALLISTICA_VERSION = '1.7.20' _g_env_config: EnvConfig | None = None diff --git a/src/ballistica/base/base.cc b/src/ballistica/base/base.cc index 65a509a8..1a6987b0 100644 --- a/src/ballistica/base/base.cc +++ b/src/ballistica/base/base.cc @@ -174,7 +174,9 @@ void BaseFeatureSet::StartApp() { python->OnMainThreadStartApp(); logic->OnMainThreadStartApp(); graphics_server->OnMainThreadStartApp(); - bg_dynamics_server->OnMainThreadStartApp(); + if (bg_dynamics_server) { + bg_dynamics_server->OnMainThreadStartApp(); + } network_writer->OnMainThreadStartApp(); audio_server->OnMainThreadStartApp(); assets_server->OnMainThreadStartApp(); diff --git a/src/ballistica/core/support/core_config.cc b/src/ballistica/core/support/core_config.cc index 8f119996..ccb6f04c 100644 --- a/src/ballistica/core/support/core_config.cc +++ b/src/ballistica/core/support/core_config.cc @@ -92,7 +92,7 @@ auto CoreConfig::FromCommandLineAndEnv(int argc, char** argv) -> CoreConfig { } // REMOVE ME FOR 1.7.20 FINAL. - printf("TEMP: forcing log_boot_process true.\n"); + printf("TEMP: forcing BA_BOOT_LOG=1 during 1.7.20 development.\n"); cfg.log_boot_process = true; try { diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 4b8721d5..01192457 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21017; +const int kEngineBuildNumber = 21018; const char* kEngineVersion = "1.7.20"; auto MonolithicMain(const core::CoreConfig& core_config) -> int {