diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch
index 16b45c00a..b79c50104 100644
--- a/patches/api/0001-POM-Changes.patch
+++ b/patches/api/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 906bfeb4ed3a2e038a73008dc4b7b4faae011118 Mon Sep 17 00:00:00 2001
+From f5a5fe00b23e0c495628950ddb91201d00b6f935 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:52:29 -0800
diff --git a/patches/api/0002-Add-server-configuration.patch b/patches/api/0002-Add-server-configuration.patch
index 7ba1d13b8..83dfccd63 100644
--- a/patches/api/0002-Add-server-configuration.patch
+++ b/patches/api/0002-Add-server-configuration.patch
@@ -1,4 +1,4 @@
-From 18f5ea789335a3cdc656e8fd229143d943049758 Mon Sep 17 00:00:00 2001
+From 672fe7fbce1691ab799b3f4ac67c890f124674b5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 15:18:38 +0800
diff --git a/patches/server/0001-Fix-errors-on-eclipse.patch b/patches/server/0001-Fix-errors-on-eclipse.patch
index 00da05b53..1de17e289 100644
--- a/patches/server/0001-Fix-errors-on-eclipse.patch
+++ b/patches/server/0001-Fix-errors-on-eclipse.patch
@@ -1,4 +1,4 @@
-From 3f169315d96829634d257991bcc4c7ea53ab86a9 Mon Sep 17 00:00:00 2001
+From 5f55a4f0caca2406dd04d3a39d29508508f2cdf0 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 00:52:56 +0700
 Subject: [PATCH] Fix errors on eclipse
diff --git a/patches/server/0002-POM-Changes.patch b/patches/server/0002-POM-Changes.patch
index e1d52fbca..44f725b52 100644
--- a/patches/server/0002-POM-Changes.patch
+++ b/patches/server/0002-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 6d51bcb384227ec5d643ea106b484646bfa3b168 Mon Sep 17 00:00:00 2001
+From 703ec6b515d695de0e19a61ddc5752c9d124bb40 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:53:58 -0800
diff --git a/patches/server/0003-Brand-changes.patch b/patches/server/0003-Brand-changes.patch
index fe30f22be..be8d1d7c4 100644
--- a/patches/server/0003-Brand-changes.patch
+++ b/patches/server/0003-Brand-changes.patch
@@ -1,4 +1,4 @@
-From 39968202da6663de5a974ea6c4c0cc2b25666aec Mon Sep 17 00:00:00 2001
+From 06a482394f671e532d4f514c453550745b548c2e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Tue, 18 Dec 2018 06:27:02 -0800
diff --git a/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch
index 2f86b88e8..12761f107 100644
--- a/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch
+++ b/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch
@@ -1,4 +1,4 @@
-From 6e129730e5864895bcea6f796a2c5ae45ec8387b Mon Sep 17 00:00:00 2001
+From 92e94da95f2bfb8ea088edf8a59adf9fa7785d7b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:29:08 +0800
diff --git a/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
index 58ad0c856..88314337b 100644
--- a/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
+++ b/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
@@ -1,4 +1,4 @@
-From edd7c3a394f752b3633f80c70d2452469061406d Mon Sep 17 00:00:00 2001
+From d0eb604ebe6f20a250dd72f9d39f065b716e509f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:43:20 +0800
diff --git a/patches/server/0006-Never-drop-items-on-command-give.patch b/patches/server/0006-Never-drop-items-on-command-give.patch
index 24092bb17..94d2886ab 100644
--- a/patches/server/0006-Never-drop-items-on-command-give.patch
+++ b/patches/server/0006-Never-drop-items-on-command-give.patch
@@ -1,4 +1,4 @@
-From 66853489efc7f560abc8fed80a2a5b2c4c9a76ab Mon Sep 17 00:00:00 2001
+From c923d8349615f5173b094aee61cad8d043e17584 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:35:19 +0800
diff --git a/patches/server/0007-Save-json-list-async.patch b/patches/server/0007-Save-json-list-async.patch
index f6a5bb4e0..66a174f87 100644
--- a/patches/server/0007-Save-json-list-async.patch
+++ b/patches/server/0007-Save-json-list-async.patch
@@ -1,4 +1,4 @@
-From 874d8e5fd0cf51275fc2c5456c108df3ef508a1b Mon Sep 17 00:00:00 2001
+From 903c98556da491303cedec003086dd0d754f0a5a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:16:18 +0800
diff --git a/patches/server/0008-Remove-method-profiler-callers.patch b/patches/server/0008-Remove-method-profiler-callers.patch
index 00252cd35..02680db27 100644
--- a/patches/server/0008-Remove-method-profiler-callers.patch
+++ b/patches/server/0008-Remove-method-profiler-callers.patch
@@ -1,4 +1,4 @@
-From daeda5ae1d3f74bdcd00a362b117eac79d687d79 Mon Sep 17 00:00:00 2001
+From 0d43199b18ae6b7d3662d56e2dd00a94d50866ed Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 12:30:35 +0800
diff --git a/patches/server/0009-Disable-Snooper.patch b/patches/server/0009-Disable-Snooper.patch
index 524fa5a06..d5103bef7 100644
--- a/patches/server/0009-Disable-Snooper.patch
+++ b/patches/server/0009-Disable-Snooper.patch
@@ -1,4 +1,4 @@
-From b7c8a8fe75cd50666ec9747d43b72f069c8a960d Mon Sep 17 00:00:00 2001
+From 691963558f805f3a9cc0902b0ad6e30126a9f757 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 14:03:29 +0800
diff --git a/patches/server/0010-Server-Config.patch b/patches/server/0010-Server-Config.patch
index 1789a7d94..1fed4990b 100644
--- a/patches/server/0010-Server-Config.patch
+++ b/patches/server/0010-Server-Config.patch
@@ -1,4 +1,4 @@
-From 32312857e072a466a2e3486e77780d296da3f5c9 Mon Sep 17 00:00:00 2001
+From 3cc7ee78a00b931cc3c008778d14e5784f911a15 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 14:59:22 +0800
diff --git a/patches/server/0011-Async-pathfinder.patch b/patches/server/0011-Async-pathfinder.patch
index 67307b4ed..8db8790ad 100644
--- a/patches/server/0011-Async-pathfinder.patch
+++ b/patches/server/0011-Async-pathfinder.patch
@@ -1,4 +1,4 @@
-From 26f55e1ed99bdf7f3b3466ca8692dc9f11049739 Mon Sep 17 00:00:00 2001
+From 937dbb928b747217d1b3097e69cf1fd6b3cdf20a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 13:01:13 +0800
diff --git a/patches/server/0012-Optimizations-for-network.patch b/patches/server/0012-Optimizations-for-network.patch
index 98728775e..034375ff1 100644
--- a/patches/server/0012-Optimizations-for-network.patch
+++ b/patches/server/0012-Optimizations-for-network.patch
@@ -1,4 +1,4 @@
-From 62939034baca99e0b34b46dcc899e27682410b5b Mon Sep 17 00:00:00 2001
+From 92f29e4176f1a5817960c22e8f43a827c6cd0a3e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 14:59:10 +0800
diff --git a/patches/server/0013-Swaps-the-predicate-order-of-collision.patch b/patches/server/0013-Swaps-the-predicate-order-of-collision.patch
index d299fbd1f..b857d4d11 100644
--- a/patches/server/0013-Swaps-the-predicate-order-of-collision.patch
+++ b/patches/server/0013-Swaps-the-predicate-order-of-collision.patch
@@ -1,4 +1,4 @@
-From 027e784f714e8b63017c87ab0d20dba9ee876977 Mon Sep 17 00:00:00 2001
+From 3d8e8c89b13f5bc5140a4843feeedba688749a89 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 10 Apr 2020 15:47:15 +0800
diff --git a/patches/server/0014-Akarin-Metrics.patch b/patches/server/0014-Akarin-Metrics.patch
index 7ff2b3f8f..38c7e8190 100644
--- a/patches/server/0014-Akarin-Metrics.patch
+++ b/patches/server/0014-Akarin-Metrics.patch
@@ -1,4 +1,4 @@
-From ee39981abac8bb6439a0b0160e04aa665c319107 Mon Sep 17 00:00:00 2001
+From ab1369b91460adfb60c4350a634a9ebfb5efb7ec Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Mon, 13 Apr 2020 13:18:27 +0800
diff --git a/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch
index 54d06aa1d..92e84c7c8 100644
--- a/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch
+++ b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch
@@ -1,4 +1,4 @@
-From 4adc6560c02462871e25c4c57fc4321b7c405f02 Mon Sep 17 00:00:00 2001
+From e26c7cbb36ac3392a50ea53e5c30bfa128a7a6be Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:39:12 +0700
 Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in
diff --git a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch
index 34ac726ff..e7a4532ad 100644
--- a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch
@@ -1,4 +1,4 @@
-From d5a8762c21d7797e62f29aa891c359d173c54660 Mon Sep 17 00:00:00 2001
+From 07cdb53d17bf4558f6e188e17af68826131ace49 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:44:07 +0700
 Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf
diff --git a/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch
index 516cfb69d..1df83dbcc 100644
--- a/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 022c1af5b92ba49b6b2a4ccb44860cbd16cac6f7 Mon Sep 17 00:00:00 2001
+From c9c8324d357057b71daaf5b72f417b17bf108bf0 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:49:56 +0700
 Subject: [PATCH] Don't run entity collision code if not needed
diff --git a/patches/server/0018-Optimize-door-interact-pathfinding.patch b/patches/server/0018-Optimize-door-interact-pathfinding.patch
index dbbf1f2c9..bcec7e52a 100644
--- a/patches/server/0018-Optimize-door-interact-pathfinding.patch
+++ b/patches/server/0018-Optimize-door-interact-pathfinding.patch
@@ -1,4 +1,4 @@
-From 272cf8391d459597cb3d1a7af02814e6ec885588 Mon Sep 17 00:00:00 2001
+From 2176d6a89e597569a040ec060106ce99713f591a Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 03:51:50 +0700
 Subject: [PATCH] Optimize door interact pathfinding
diff --git a/patches/server/0019-Remove-stream-for-ender-teleport.patch b/patches/server/0019-Remove-stream-for-ender-teleport.patch
index 96ce31e8c..ce9a62759 100644
--- a/patches/server/0019-Remove-stream-for-ender-teleport.patch
+++ b/patches/server/0019-Remove-stream-for-ender-teleport.patch
@@ -1,4 +1,4 @@
-From 9e9d3cfdcd213943f525a3d1a81abd7db6c38797 Mon Sep 17 00:00:00 2001
+From 6b522ba6a95bf21369dc3f41f9b2ddbcc6e93740 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 04:16:44 +0700
 Subject: [PATCH] Remove stream for ender teleport
diff --git a/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch b/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch
index 4c6e80f85..ef12926c3 100644
--- a/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch
+++ b/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch
@@ -1,4 +1,4 @@
-From 64251523cd583604d4806817b6115ad35919d726 Mon Sep 17 00:00:00 2001
+From 2bc88b8902b17a4ae0e22010f4591b500296e6b9 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 04:28:25 +0700
 Subject: [PATCH] Cache Hashcode for BlockPosition
diff --git a/scripts/updateUpstream.sh b/scripts/updateUpstream.sh
index 4ac2dcdcc..39fb0d9a9 100755
--- a/scripts/updateUpstream.sh
+++ b/scripts/updateUpstream.sh
@@ -29,7 +29,7 @@ subtasks=1
 updatepaper=$2
 if [ "$updatepaper" == "1" ]; then
     echo "  $(bashcolor 1 32)(0/$subtasks)$(bashcolorend) - Update Git submodules.."
-    git submodule update --init --recursive
+    $gitcmd submodule update --init --recursive
 fi
 
 if [[ "$2" == "--resetPaper" ]]; then