diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index 1d888e76..550aa380 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -2004,6 +2004,7 @@ spinoff spinoffdata spinoffs + spinup splayer splitlen splitnumstr diff --git a/assets/src/server/ballisticacore_server.py b/assets/src/server/ballisticacore_server.py index fe8b47a8..d2a7c53f 100755 --- a/assets/src/server/ballisticacore_server.py +++ b/assets/src/server/ballisticacore_server.py @@ -714,8 +714,11 @@ class ServerManagerApp: # alive. if (self._subprocess_force_kill_time is not None and time.time() > self._subprocess_force_kill_time): - print(f'{Clr.CYN}Force-killing subprocess...{Clr.RST}', - flush=True) + print( + f'{Clr.CYN}Immediate shutdown time limit' + f' ({self.IMMEDIATE_SHUTDOWN_TIME_LIMIT:.1f} seconds)' + f' expired; force-killing subprocess...{Clr.RST}', + flush=True) break # Watch for the server process exiting.. diff --git a/ballisticacore-cmake/.idea/dictionaries/ericf.xml b/ballisticacore-cmake/.idea/dictionaries/ericf.xml index 950a1e42..98cb16b6 100644 --- a/ballisticacore-cmake/.idea/dictionaries/ericf.xml +++ b/ballisticacore-cmake/.idea/dictionaries/ericf.xml @@ -865,6 +865,7 @@ spaz spead sphrand + spinup spivak srcattr srcpath