diff --git a/.github/workflows/build-without-pwt.yml b/.github/workflows/build-without-pwt.yml
new file mode 100644
index 0000000..a3884f4
--- /dev/null
+++ b/.github/workflows/build-without-pwt.yml
@@ -0,0 +1,41 @@
+name: Patch and Build
+
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+
+jobs:
+  build:
+    # Only run on PRs if the source branch is on someone else's repo
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Git Repository
+        uses: actions/checkout@v3
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Configure Git User Details
+        run: git config --global user.email "actions@github.com" && git config --global user.name "Github Actions"
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Delete Parallel world ticking patch
+        run: rm patches/server/*-Parallel-world-ticking.patch
+      - name: Apply Patches
+        run: ./gradlew applyPatches
+      - name: Build
+        run: ./gradlew build
+      - name: Create reobf Paperclip JAR
+        run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt createReobfPaperclipJar
+      - uses: actions/upload-artifact@v2
+        name: "Upload Paperclip JAR"
+        with:
+          name: SparklyPaper (without Parallel World Ticking) Paperclip
+          path: "build/libs/SparklyPaper-paperclip-*.jar"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad06632..fa345f6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,16 +37,3 @@ jobs:
         with:
           name: SparklyPaper Paperclip
           path: "build/libs/SparklyPaper-paperclip-*.jar"
-      - name: Delete Parallel world ticking patch
-        run: rm patches/server/*-Parallel-world-ticking.patch
-      - name: Apply Patches (without Parallel World Ticking)
-        run: ./gradlew applyPatches
-      - name: Build (without Parallel World Ticking)
-        run: ./gradlew build
-      - name: Create reobf Paperclip JAR (without Parallel World Ticking)
-        run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt createReobfPaperclipJar
-      - uses: actions/upload-artifact@v2
-        name: "Upload Paperclip JAR (without Parallel World Ticking)"
-        with:
-          name: SparklyPaper (without Parallel World Ticking) Paperclip
-          path: "build/libs/SparklyPaper-paperclip-*.jar"