From 46315feec1386ce5bc79ce50490d32a5f278f4af Mon Sep 17 00:00:00 2001
From: Pentium44 <cdorm245@gmail.com>
Date: Thu, 18 Feb 2021 19:59:14 -0800
Subject: [PATCH] Fix floating servers on server delete when server's left
 running

---
 index.php |  5 -----
 server    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/index.php b/index.php
index 8b09654c..f1234db1 100755
--- a/index.php
+++ b/index.php
@@ -458,15 +458,10 @@ else if(isset($_GET['do']))
 				if($serverstatus == "true") {
 					file_put_contents("mtm_db/events/$userid", "./server del $userid");
 					sleep(2);
-					unlink("mtm_db/users/$userid.pid.status");
-					unlink("mtm_db/users/$userid.pid.statuscode");
 					header("Location: index.php");
 				} else {
                     file_put_contents("mtm_db/events/$userid", "./server del $userid");
                     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");
 				}
 			} else {
diff --git a/server b/server
index 2660e26a..2217af3d 100755
--- a/server
+++ b/server
@@ -48,8 +48,13 @@ case $1 in
 		killall minetestserver
         killall multicraftserver
 		;;
-	stop ) 
-		kill -9 $(cat mtm_db/pids/$2.pid)
+	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)
+        fi
         ;;
     set-gamemode )
         echo "gameid = $3" >> mtm_db/worlds/$2/worlds/world/world.mt
@@ -57,8 +62,11 @@ case $1 in
         ;;
 	del )
         kill -9 $(cat mtm_db/pids/$2.pid)
+        sleep 5
         rm -r mtm_db/worlds/$2
         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;;
     mkmoddir ) mkdir mtm_db/worlds/$2/worlds/world/worldmods;;