Grasscutters/GrassClipper
3
0
Fork 0
mirror of https://github.com/Grasscutters/GrassClipper.git synced 2024-11-22 07:08:11 +00:00
Code Issues Projects Releases Wiki Activity

fix killswitch a lil

Browse Source
This commit is contained in:
SpikeHD 2022-05-05 20:37:43 -07:00
parent a69e36d7bb
commit dc7c766499
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/killswitch.cmd
View File

@ -22,6 +22,9 @@ if "%PROXY_IP%" EQU "localhost" (
) )
:loop :loop
:: Wait a couple seconds
ping 127.0.0.1 -n 2 > nul
:: Check if the game is even running :: Check if the game is even running
:: tasklist /fi "ImageName eq %GAME_EXE_NAME%" /fo csv 2>NUL | find /I "%GAME_EXE_NAME%.exe">NUL :: tasklist /fi "ImageName eq %GAME_EXE_NAME%" /fo csv 2>NUL | find /I "%GAME_EXE_NAME%.exe">NUL
:: IF %ERRORLEVEL% NEQ 0 ( :: IF %ERRORLEVEL% NEQ 0 (
@ -32,6 +35,7 @@ if "%PROXY_IP%" EQU "localhost" (
:: https://stackoverflow.com/questions/162291/how-to-check-if-a-process-is-running-via-a-batch-script :: https://stackoverflow.com/questions/162291/how-to-check-if-a-process-is-running-via-a-batch-script
tasklist /fi "ImageName eq mitmdump.exe" /fo csv 2>NUL | find /I "mitmdump.exe">NUL tasklist /fi "ImageName eq mitmdump.exe" /fo csv 2>NUL | find /I "mitmdump.exe">NUL
if "%ERRORLEVEL%" NEQ "0" ( if "%ERRORLEVEL%" NEQ "0" (
echo "mitmdump not running"
goto killgame goto killgame
) )
@ -50,6 +54,7 @@ if "%PROXY_IP%" EQU "localhost" (
:: Ensure proxy is enabled, space is there on purpose :: Ensure proxy is enabled, space is there on purpose
IF "%PROXY_ENABLED%" NEQ "0x1 " ( IF "%PROXY_ENABLED%" NEQ "0x1 " (
echo "Proxy server disabled in windows"
goto killgame goto killgame
) )
@ -59,11 +64,10 @@ if "%PROXY_IP%" EQU "localhost" (
:: There is a space after %PROXY_IP on purpose, Windows is weird :: There is a space after %PROXY_IP on purpose, Windows is weird
if "%CUR_PROXY_IP%" NEQ "%PROXY_IP%:8080 " ( if "%CUR_PROXY_IP%" NEQ "%PROXY_IP%:8080 " (
echo "Cur proxy: %CUR_PROXY_IP% | Proxy: %PROXY_IP%:8080"
goto killgame goto killgame
) )
ping 127.0.0.1 -n 2 > nul
goto loop goto loop
:killgame :killgame

2
scripts/private_server_launch.cmd
View File

@ -60,7 +60,7 @@ echo Killswitch: %ENABLE_KILLSWITCH%
if "%ENABLE_KILLSWITCH%" EQU "true" ( if "%ENABLE_KILLSWITCH%" EQU "true" (
echo Killswitch is enabled! echo Killswitch is enabled!
:: Start killswitch :: Start killswitch
start /b %ORIGIN%\scripts\killswitch.cmd "%GAME_EXE%" %IP% start /b %ORIGIN%\scripts\killswitch.cmd "%GAME_EXE%" 127.0.0.1
) )
:: Launch game :: Launch game