Fix the wrapper so @serverexit 104 works, and remove @serverexit 105+

2 files changed, 5 insertions, 74 deletions

diff --git a/herculeswrapper/include.sh b/herculeswrapper/include.sh
index 1c8990c..24090cd 100644
--- a/herculeswrapper/include.sh
+++ b/herculeswrapper/include.sh
@@ -53,25 +53,9 @@ function hard_reset {
 }
 
 function pull_all {
-    hard_reset "data"
-    #cd ../client-data
-    #hard_reset "client"
-    #cd ../music
-    #hard_reset "music"
-    cd ../server-code
-    hard_reset "code"
-    cd src/evol
-    hard_reset "plugin"
-    cd ../../../tools
-    hard_reset "tools"
-    cd ..
-    ./pull.sh
-    cd server-data
-    git_merge
     cd ../
-    ./status.sh
+    ./pull.sh force
     cd server-data
-    make maps
 }
 
 function build_all {
diff --git a/herculeswrapper/map.sh b/herculeswrapper/map.sh
index 055acd7..ffd7e76 100755
--- a/herculeswrapper/map.sh
+++ b/herculeswrapper/map.sh
@@ -28,12 +28,12 @@ while [ 1 ] ; do
     101)
         echo "Restarting all servers..."
         send_all_pipes "restart"
-        sleep 5s
+        sleep 7s
         ;;
     102)
-        echo "Restarting chat and map servers..."
+        echo "Restarting char and map servers..."
         send_char_pipe "restart"
-        sleep 3s
+        sleep 5s
         ;;
     103)
         echo "Restarting map server..."
@@ -43,60 +43,7 @@ while [ 1 ] ; do
         pull_all
         echo "Restarting all servers..."
         send_all_pipes "restart"
-        sleep 5s
-        ;;
-    105)
-        echo "Build all servers"
-        sleep 5s
-        build_all
-        echo "Restarting all servers..."
-        send_all_pipes "restart"
-        sleep 5s
-        ;;
-    106)
-        echo "Rebuild all servers"
-        sleep 5s
-        build_clean
-        build_all
-        echo "Restarting all servers..."
-        send_all_pipes "restart"
-        sleep 5s
-        ;;
-    107)
-        echo "git pull..."
-        pull_all
-        echo "Build all servers"
-        build_all
-        echo "Restarting all servers..."
-        send_all_pipes "restart"
-        sleep 5s
-        ;;
-    108)
-        echo "git pull..."
-        pull_all
-        echo "Rebuild all servers"
-        build_clean
-        build_all
-        echo "Restarting all servers..."
-        send_all_pipes "restart"
-        sleep 5s
-        ;;
-    109)
-        echo "Build plugin"
-        sleep 5s
-        build_plugin
-        echo "Restarting all servers..."
-        send_all_pipes "restart"
-        sleep 5s
-        ;;
-    110)
-        echo "git pull..."
-        pull_all
-        echo "Build plugin"
-        build_plugin
-        echo "Restarting all servers..."
-        send_all_pipes "restart"
-        sleep 5s
+        sleep 7s
         ;;
     esac
 done