diff --git a/bin/compile b/bin/compile index 4d5b12a..2de8c68 100755 --- a/bin/compile +++ b/bin/compile @@ -7,10 +7,6 @@ mv $BIN_DIR/start $BUILD_DIR/bin/ mv $BIN_DIR/cron $BUILD_DIR/bin/ mv $BIN_DIR/excludes $BUILD_DIR/bin/ -curl -o inotify-tools.deb -s -L "http://security.ubuntu.com/ubuntu/pool/universe/i/inotify-tools/inotify-tools_3.14-2_amd64.deb" -dpkg -x *.deb . -mv usr/bin/inotifywait $BUILD_DIR/bin/ - curl -o $BUILD_DIR/minecraft-server.jar -s -L "https://yivesmirror.com/files/paperspigot/PaperSpigot-latest.jar" curl -o $BUILD_DIR/plugins/DoBlockImage.jar -s -L "https://api.spiget.org/v2/resources/5454/download" curl -o Essentials.zip -s -L "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/Essentials/target/*zip*/target.zip" diff --git a/bin/cron b/bin/cron index c4bb094..b212a90 100755 --- a/bin/cron +++ b/bin/cron @@ -3,4 +3,8 @@ PID="$(pgrep java)" kill -9 $PID rm -rf plugins/ worlds/ ssh -i .key -o StrictHostKeyChecking=no serv@kaboom.pw 'rm -rf sync/' -reboot + +while true; do + java -Xms300m -XX:MinHeapFreeRatio=1 -XX:MaxHeapFreeRatio=10 -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:G1MixedGCLiveThresholdPercent=50 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:MaxGCPauseMillis=100 -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:InitiatingHeapOccupancyPercent=10 -XX:TargetSurvivorRatio=90 -XX:+UseLargePagesInMetaspace -Dcom.mojang.eula.agree=true -Dlog4j.configurationFile=log4j2.xml -jar minecraft-server.jar --world-dir=worlds > /dev/null 2>&1 + sleep 1 +done & diff --git a/bin/start b/bin/start index 2a5f855..90caaaa 100755 --- a/bin/start +++ b/bin/start @@ -4,7 +4,7 @@ touch banned-ips.json banned-ips.json.backup banned-players.json banned-players. echo "$PRIVATE_KEY" > .key chmod -R 500 crash-reports/ dumps/ plugins/bStats/ plugins/PluginMetrics/ plugins/ProtocolLib/ plugins/Updater/ chmod 400 'find . -type f' -rsync -Waqz -e "ssh -i .key -o StrictHostKeyChecking=no -T -c aes256-ctr -o Compression=no -x" --exclude-from="bin/excludes" serv@kaboom.pw:sync/ . +rsync -Waq -e "ssh -i .key -o StrictHostKeyChecking=no -T -c aes256-ctr -o Compression=no -x" --exclude-from="bin/excludes" serv@kaboom.pw:sync/ . if [ ! -d worlds/ ]; then cp -r reset/worlds/ . @@ -14,9 +14,8 @@ else fi while true; do - bin/inotifywait -r -e modify,attrib,close_write,move,create,delete . - rsync -Waqz -e "ssh -i .key -o StrictHostKeyChecking=no -T -c aes256-ctr -o Compression=no -x" --exclude-from="bin/excludes" plugins worlds serv@kaboom.pw:sync/ > /dev/null 2>&1 - sleep 1 + rsync -Waq -e "ssh -i .key -o StrictHostKeyChecking=no -T -c aes256-ctr -o Compression=no -x" --exclude-from="bin/excludes" plugins worlds serv@kaboom.pw:sync/ > /dev/null 2>&1 + sleep 5 done & while true; do