From 6aafe1e43d1795b532f611cb4827ddeccef7a373 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Sun, 9 Jan 2022 21:52:21 -0600 Subject: [PATCH 1/3] Updated version number for next patch. --- server_ver.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_ver.groovy b/server_ver.groovy index 5c0fbf8..d8b4dc9 100755 --- a/server_ver.groovy +++ b/server_ver.groovy @@ -1,3 +1,3 @@ env.VER_MAJOR=0 env.VER_MINOR=0 -env.VER_PATCH=7 +env.VER_PATCH=8 From e49964b8941b7405a405f2220a91e0f9a5f1d3f9 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Mon, 10 Jan 2022 04:02:36 -0600 Subject: [PATCH 2/3] Updated version number for next patch. --- server_ver.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_ver.groovy b/server_ver.groovy index d8b4dc9..a57b60e 100755 --- a/server_ver.groovy +++ b/server_ver.groovy @@ -1,3 +1,3 @@ env.VER_MAJOR=0 env.VER_MINOR=0 -env.VER_PATCH=8 +env.VER_PATCH=9 From 34d0df7cbda4f97fd7b67d27ee6c21e5482f60c7 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Mon, 10 Jan 2022 04:23:40 -0600 Subject: [PATCH 3/3] Separated update from run script. --- run.sh | 4 +--- update.sh | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100755 update.sh diff --git a/run.sh b/run.sh index 5717054..81aa84c 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,5 @@ #!/bin/sh -git checkout master -git reset --hard -git pull origin master --ff-only +./update.sh java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui \ No newline at end of file diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..9988fa1 --- /dev/null +++ b/update.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +git reset --hard +git pull origin master --ff-only +git checkout master@{'24 hours ago'} \ No newline at end of file