Merge branch 'hotfix/v21.2.5'

GameServerManagers · Aug 6, 2021 · 61ee050 · 61ee050
2 parents c87a530 + 79b6056
commit 61ee050
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
@@ -8,7 +8,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v21.2.4"
+modulesversion="v21.2.5"
 
 # Core
 

diff --git a/lgsm/functions/update_minecraft_bedrock.sh b/lgsm/functions/update_minecraft_bedrock.sh
@@ -7,8 +7,11 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
+#random number for userAgent
+randnum=$((1 + RANDOM % 5000))
+
 fn_update_minecraft_dl(){
- latestmcbuildurl=$(curl -Ls "https://www.minecraft.net/en-us/download/server/bedrock/" | grep -o 'https://minecraft.azureedge.net/bin-linux/[^"]*zip')
+ latestmcbuildurl=$(curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -Ls -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.${randnum}.212 Safari/537.36" "https://www.minecraft.net/en-us/download/server/bedrock/" | grep -o 'https://minecraft.azureedge.net/bin-linux/[^"]*zip')
  fn_fetch_file "${latestmcbuildurl}" "" "" "" "${tmpdir}" "bedrock_server.${remotebuild}.zip"
  echo -e "Extracting to ${serverfiles}...\c"
  if [ "${firstcommandname}" == "INSTALL" ]; then
@@ -79,7 +82,7 @@ fn_update_minecraft_localbuild(){
 
 fn_update_minecraft_remotebuild(){
  # Gets remote build info.
- remotebuild=$(curl -Ls "https://www.minecraft.net/en-us/download/server/bedrock/" | grep -o 'https://minecraft.azureedge.net/bin-linux/[^"]*' | sed 's/.*\///' | grep -Eo "[.0-9]+[0-9]")
+ remotebuild=$(curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -Ls -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.${randnum}.212 Safari/537.36" "https://www.minecraft.net/en-us/download/server/bedrock/" | grep -o 'https://minecraft.azureedge.net/bin-linux/[^"]*' | sed 's/.*\///' | grep -Eo "[.0-9]+[0-9]")
  if [ "${firstcommandname}" != "INSTALL" ]; then
  fn_print_dots "Checking remote build: ${remotelocation}"
  # Checks if remotebuild variable has been set.

diff --git a/linuxgsm.sh b/linuxgsm.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.4"
+version="v21.2.5"
 shortname="core"
 gameservername="core"
 commandname="CORE"

diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.4"
+version="v21.2.5"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.4"
+version="v21.2.5"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.4"
+version="v21.2.5"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.4"
+version="v21.2.5"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"