From 60d3a51ebca0ce2c1f0fb900df64fbb510a5303e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 10 May 2022 20:08:48 -0400
Subject: [PATCH] What a horrible waste of time

---
 .github/workflows/deployment.yml        |  2 --
 .github/workflows/push.yml              |  4 ----
 build.gradle                            | 17 +++--------------
 core/src/mindustry/ai/BlockIndexer.java |  2 +-
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 478119830a..95343c4cb6 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -17,8 +17,6 @@ jobs:
         java-version: 17
     - name: Set env
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-    - name: Publish package
-      run: ./gradlew clean publish -PpackageVersion=${RELEASE_VERSION}
     - name: Add Arc release
       run: |
         git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 6700a045eb..903cf7435e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -33,9 +33,5 @@ jobs:
           git commit -m "Automatic bundle update"
           git push
         fi
-    - name: Publish package
-      run: ./gradlew clean publish -PpackageVersion=${GITHUB_SHA}
-      env:
-        PACKAGE_TOKEN: ${{ secrets.PACKAGE_TOKEN }}
     - name: Run unit tests
       run: ./gradlew clean cleanTest test --stacktrace
diff --git a/build.gradle b/build.gradle
index 356c6d4c93..5956dae08c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -468,20 +468,9 @@ configure([":core", ":server"].collect{project(it)}){
     }
 
     publishing{
-        repositories{
-            maven{
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/anuken/mindustry")
-                credentials{
-                    username = project.findProperty("gpr.user") ?: "Anuken"
-                    password = project.findProperty("gpr.key") ?: System.getenv("PACKAGE_TOKEN")
-                }
-            }
-        }
-
-        publications {
-            gpr(MavenPublication) {
-                from(components.java)
+        publications{
+            maven(MavenPublication){
+                from components.java
             }
         }
     }
diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
index a1a014fc5d..32a67a0838 100644
--- a/core/src/mindustry/ai/BlockIndexer.java
+++ b/core/src/mindustry/ai/BlockIndexer.java
@@ -337,7 +337,7 @@ public class BlockIndexer{
         int size = breturnArray.size;
         for(int i = 0; i < size; i++){
             var b = items[i];
-            if(b.within(x, y, range + b.hitSize()/2f)){
+            if(b != null && b.within(x, y, range + b.hitSize()/2f)){
                 cons.get(b);
             }
             items[i] = null;