Clean tests before running

Violet-Scarelli · Dec 3, 2020 · 51b4078 · 51b4078
1 parent db8d099
commit 51b4078
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -13,7 +13,7 @@ jobs:
       with:
         java-version: 14
     - name: Run unit tests
-      run: ./gradlew test
+      run: ./gradlew clean cleanTest test
     - name: Trigger BE build
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |

diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -255,7 +255,7 @@ public void updateTile(){
         }
 
         public boolean pass(Item item){
-            if(next != null && next.team == team && next.acceptItem(this, item)){
+            if(item != null && next != null && next.team == team && next.acceptItem(this, item)){
                 next.handleItem(this, item);
                 return true;
             }