Pentium44/MTSM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix floating servers on server delete when server's left running

Browse Source
This commit is contained in:
Pentium44 2021-02-18 19:59:14 -08:00
parent 5da7b13a2a
commit 46315feec1
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
index.php
View File

@ -458,15 +458,10 @@ else if(isset($_GET['do']))
if($serverstatus == "true") { if($serverstatus == "true") {
file_put_contents("mtm_db/events/$userid", "./server del $userid"); file_put_contents("mtm_db/events/$userid", "./server del $userid");
sleep(2); sleep(2);
unlink("mtm_db/users/$userid.pid.status");
unlink("mtm_db/users/$userid.pid.statuscode");
header("Location: index.php"); header("Location: index.php");
} else { } else {
file_put_contents("mtm_db/events/$userid", "./server del $userid"); file_put_contents("mtm_db/events/$userid", "./server del $userid");
sleep(2); sleep(2);
unlink("mtm_db/users/$userid.pid.status");
unlink("mtm_db/users/$userid.pid.statuscode");
unlink("mtm_db/pids/$userid.pid");
header("Location: index.php"); header("Location: index.php");
} }
} else { } else {

8
server
View File

@ -49,7 +49,12 @@ case $1 in
killall multicraftserver killall multicraftserver
;; ;;
stop ) stop )
kill -15 $(cat mtm_db/pids/$2.pid)
sleep 15
if ps -p $(cat mtm_db/pids/$2.pid) > /dev/null
then
kill -9 $(cat mtm_db/pids/$2.pid) kill -9 $(cat mtm_db/pids/$2.pid)
fi
;; ;;
set-gamemode ) set-gamemode )
echo "gameid = $3" >> mtm_db/worlds/$2/worlds/world/world.mt echo "gameid = $3" >> mtm_db/worlds/$2/worlds/world/world.mt
@ -57,8 +62,11 @@ case $1 in
;; ;;
del ) del )
kill -9 $(cat mtm_db/pids/$2.pid) kill -9 $(cat mtm_db/pids/$2.pid)
sleep 5
rm -r mtm_db/worlds/$2 rm -r mtm_db/worlds/$2
rm mtm_db/pids/$2.pid rm mtm_db/pids/$2.pid
echo "false" > mtm_db/users/$2.pid.statuscode
echo "<div style='display:inline;color:#ff0000;'>Stopped</div>" > mtm_db/users/$2.pid.status
;; ;;
del-debug ) rm mtm_db/worlds/$2/debug.txt;; del-debug ) rm mtm_db/worlds/$2/debug.txt;;
mkmoddir ) mkdir mtm_db/worlds/$2/worlds/world/worldmods;; mkmoddir ) mkdir mtm_db/worlds/$2/worlds/world/worldmods;;