Updated checksums for terraria-server-1353.zip, fixed server crashes with mono versions 5.x

3 files changed, 16 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28eefa312fa9..628ea637b098 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = terraria-server
 	pkgdesc = Official dedicated server for Terraria
 	pkgver = 1.3.5.3
-	pkgrel = 21
+	pkgrel = 22
 	url = https://terraria.org/
 	install = terraria-server.install
 	arch = x86_64
@@ -11,11 +11,13 @@ pkgbase = terraria-server
 	depends = mono
 	depends = screen
 	source = http://terraria.org/server/terraria-server-1353.zip
+	source = https://github.com/mono/reference-assemblies/blob/c7ca004a743b7232f024831070536e9d2b8fcf83/v4.7.1/System.dll?raw=true
 	source = terraria-server
 	source = config.txt
 	source = terraria-server@.service
-	sha256sums = 588c9e80d4e6539bbacbb8b59822a14c1e6624c3bd377bdd3a301e932427452c
-	sha256sums = 6250009dabc3351692eea3a7df3b1e6fa7b144a8149ffc08827f37c034cc230f
+	sha256sums = 63b232323f094ea71e49ec1bb578a816b751db9f872ad70ebc1d921b8d15f250
+	sha256sums = ce3bbc512e0f82a8a034ff67b68a2f3467c8374f0d6d1c015d1484c5c422e422
+	sha256sums = fba253786b8668dabd18b03514b24b3aac9b24ed9a74dfdacee35f41659c30c9
 	sha256sums = 6a87f9f758811528913fa4828667b200ab7dcb6623734475ecbd8f8dab337b2f
 	sha256sums = b2cfeb15b6e5bf97d1b7a0b0bdbec9289a842d37c52414c5b57aadda66b1b6a6
 
diff --git a/PKGBUILD b/PKGBUILD
index 191c9ba76179..d77c499ec052 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=terraria-server
 pkgver=1.3.5.3
-pkgrel=21
+pkgrel=22
 pkgdesc="Official dedicated server for Terraria"
 arch=('x86_64' 'x86')
 license=('unknown')
@@ -13,18 +13,25 @@ install='terraria-server.install'
 
 _pkgver=$(echo $pkgver | sed 's/\.//g')
 
+# Added updated mono System.dll so the server works with mono 5.x
 source=("http://terraria.org/server/${pkgname}-${_pkgver}.zip"
+				"https://github.com/mono/reference-assemblies/blob/c7ca004a743b7232f024831070536e9d2b8fcf83/v4.7.1/System.dll?raw=true"
         'terraria-server'
         'config.txt'
         'terraria-server@.service')
 
-sha256sums=('588c9e80d4e6539bbacbb8b59822a14c1e6624c3bd377bdd3a301e932427452c'
-            '6250009dabc3351692eea3a7df3b1e6fa7b144a8149ffc08827f37c034cc230f'
+sha256sums=('63b232323f094ea71e49ec1bb578a816b751db9f872ad70ebc1d921b8d15f250'
+						'ce3bbc512e0f82a8a034ff67b68a2f3467c8374f0d6d1c015d1484c5c422e422'
+            'fba253786b8668dabd18b03514b24b3aac9b24ed9a74dfdacee35f41659c30c9'
             '6a87f9f758811528913fa4828667b200ab7dcb6623734475ecbd8f8dab337b2f'
             'b2cfeb15b6e5bf97d1b7a0b0bdbec9289a842d37c52414c5b57aadda66b1b6a6')
 
 package() {
     unzip -o "${pkgname}-${_pkgver}.zip"
+
+		# Copy the updated System.dll to "${_pkgver}/Linux/System.dll"
+		cp -rv "System.dll?raw=true" "${_pkgver}/Linux/System.dll"
+
     cd "${_pkgver}/Linux"
     dest="${pkgdir}/opt/terraria-server"
     install -o 697 -g 697  -d "${dest}"
diff --git a/terraria-server b/terraria-server
index fc64c393ebfd..1bfc6ef8b1e9 100755
--- a/terraria-server
+++ b/terraria-server
@@ -10,4 +10,4 @@ do
                 args[$i]=$(realpath ${args[$i]});
         fi
 done
-/opt/terraria-server/TerrariaServer.bin.${arch} "${args[@]}"
+mono /opt/terraria-server/TerrariaServer.exe "${args[@]}"