diff --git a/Paper b/Paper
index bc17ce69d..92d2907d1 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit bc17ce69d4b17bd5d54dba39a893f031c71e048b
+Subproject commit 92d2907d14e2dd9b230940cda69f383c9b9f6080
diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch
index bcb0d04b3..0643c08de 100644
--- a/patches/api/0001-POM-Changes.patch
+++ b/patches/api/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 451f860923d6872474dd97f2b29d4fa389eef617 Mon Sep 17 00:00:00 2001
+From d84c143b0860e5baeefb342ad0ed676ad6b279f1 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-Server-Config.patch b/patches/api/0002-Server-Config.patch
index cb283ed2c..338b89733 100644
--- a/patches/api/0002-Server-Config.patch
+++ b/patches/api/0002-Server-Config.patch
@@ -1,4 +1,4 @@
-From 826f2acc2c1b671364e785e9a711319124195b83 Mon Sep 17 00:00:00 2001
+From 0c9bb007c213359ccf56fd63c1d9784318d55dba 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-POM-Changes.patch b/patches/server/0001-POM-Changes.patch
index 5ae28bce2..8eed3caa3 100644
--- a/patches/server/0001-POM-Changes.patch
+++ b/patches/server/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 49f54efc6cbccbab4cfc22092a8f082bedad0680 Mon Sep 17 00:00:00 2001
+From 034929b8d0797da44986268dc3e91f38d676c2d3 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/0002-Brand-changes.patch b/patches/server/0002-Brand-changes.patch
index 63d659fad..db78a6a53 100644
--- a/patches/server/0002-Brand-changes.patch
+++ b/patches/server/0002-Brand-changes.patch
@@ -1,4 +1,4 @@
-From 8afa07bbddc4de731f0c1cc16fcc2bda4a0f1a6b Mon Sep 17 00:00:00 2001
+From f74bd2a8259e2dd0fd6626377814b603dc777300 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/0003-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch
index 8c469b40d..52b512ef9 100644
--- a/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch
+++ b/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch
@@ -1,4 +1,4 @@
-From 97bf7cdb61acb7fb8d779cfa2ba180dc68f885db Mon Sep 17 00:00:00 2001
+From abae72dd1fa23dad0d85481c748aa1aed2412dd7 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/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
index 752541034..ff9906d8f 100644
--- a/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
+++ b/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
@@ -1,4 +1,4 @@
-From eb9755b2826b684d490cbf8911f639588748a3de Mon Sep 17 00:00:00 2001
+From 1047f3330530b77a5f2b70eac07f4d824278724a 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/0005-never-drop-items-on-command-give.patch b/patches/server/0005-never-drop-items-on-command-give.patch
index 3ac8905f9..d21215d4c 100644
--- a/patches/server/0005-never-drop-items-on-command-give.patch
+++ b/patches/server/0005-never-drop-items-on-command-give.patch
@@ -1,4 +1,4 @@
-From 1a401b7748c3ca37ecf2c464888809e2ef01cf03 Mon Sep 17 00:00:00 2001
+From 6df8412bf5653c1b99120026033198cf467f9179 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/0006-Save-json-list-async.patch b/patches/server/0006-Save-json-list-async.patch
index 14ab92e24..29bce5e48 100644
--- a/patches/server/0006-Save-json-list-async.patch
+++ b/patches/server/0006-Save-json-list-async.patch
@@ -1,4 +1,4 @@
-From e0718d6b2b64b8f95fa452f7cb06faebdb74817d Mon Sep 17 00:00:00 2001
+From a8118e0a72fd023f33c4b2b56cad8f0d2faa221b 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/0007-Remove-method-profiler-callers.patch b/patches/server/0007-Remove-method-profiler-callers.patch
index a0e7a9062..d3bb1230a 100644
--- a/patches/server/0007-Remove-method-profiler-callers.patch
+++ b/patches/server/0007-Remove-method-profiler-callers.patch
@@ -1,4 +1,4 @@
-From 3950f8c78c334400409f232141e16e1489668e3b Mon Sep 17 00:00:00 2001
+From 40b0da3b0bba5aa82261e1be7b4775ab6f68e5c7 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/0008-Disable-Snooper.patch b/patches/server/0008-Disable-Snooper.patch
index 301f36bad..3f1994f4b 100644
--- a/patches/server/0008-Disable-Snooper.patch
+++ b/patches/server/0008-Disable-Snooper.patch
@@ -1,4 +1,4 @@
-From fc11d046a4c647b8a937de6ee3fce8c62716d44c Mon Sep 17 00:00:00 2001
+From 209375b773de240f70ba94e1bb40d660f1ab141f 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/0009-Server-Config.patch b/patches/server/0009-Server-Config.patch
index fb214464f..d2791662f 100644
--- a/patches/server/0009-Server-Config.patch
+++ b/patches/server/0009-Server-Config.patch
@@ -1,4 +1,4 @@
-From ce97ab1fd6c780af9349a412ce08a3be11b5ade5 Mon Sep 17 00:00:00 2001
+From 74a5693593c0b2da5e6e2acdc55c1c59095a979a 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/0010-Async-pathfinder.patch b/patches/server/0010-Async-pathfinder.patch
index 170e8f02a..a7a139be5 100644
--- a/patches/server/0010-Async-pathfinder.patch
+++ b/patches/server/0010-Async-pathfinder.patch
@@ -1,4 +1,4 @@
-From c9418782de5dd5c3029b77266768d8462ee33c91 Mon Sep 17 00:00:00 2001
+From cff15a6e93606d4e28e1c11c79e877c09860be75 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/0011-Optimizations-for-network.patch b/patches/server/0011-Optimizations-for-network.patch
index e5863305c..dff6d37fb 100644
--- a/patches/server/0011-Optimizations-for-network.patch
+++ b/patches/server/0011-Optimizations-for-network.patch
@@ -1,4 +1,4 @@
-From 5cadee0902dc175d79e6a94bd1027d5232494562 Mon Sep 17 00:00:00 2001
+From ab3f87a5c44f4327174f794c3c7a0e794245c64f 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/0012-Swaps-the-predicate-order-of-collision.patch b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch
index 72310785e..dff022529 100644
--- a/patches/server/0012-Swaps-the-predicate-order-of-collision.patch
+++ b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch
@@ -1,4 +1,4 @@
-From 160f809971571a322f29f135a6a7b1939d774260 Mon Sep 17 00:00:00 2001
+From 65cdd24a64095abd1652ad111933c081df1c36d2 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/scripts/applyPatches.sh b/scripts/applyPatches.sh
index 7d6c108a2..530c75fe6 100755
--- a/scripts/applyPatches.sh
+++ b/scripts/applyPatches.sh
@@ -40,7 +40,7 @@ function applyPatch {
 	$gitcmd branch -D upstream >/dev/null &> /dev/null
 	$gitcmd branch -f upstream "$branch" &> /dev/null && $gitcmd checkout upstream &> /dev/null
 	
-	if [ $needimport && [ $baseproject != "Paper/Paper-API" ] ]; then
+	if [ $needimport ] && [ $baseproject != "Paper/Paper-API" ]; then
 	    echo "  $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.."
 	    basedir && $scriptdir/importSources.sh $basedir 1
     fi