Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean tests before running

Browse Source
This commit is contained in:
Anuken
2020-12-03 11:05:02 -05:00
parent db8d099fcc
commit 51b4078288
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/push.yml vendored
View File

@@ -13,7 +13,7 @@ jobs:
with: with:
java-version: 14 java-version: 14
- name: Run unit tests - name: Run unit tests
run: ./gradlew test run: ./gradlew clean cleanTest test
- name: Trigger BE build - name: Trigger BE build
if: ${{ github.repository == 'Anuken/Mindustry' }} if: ${{ github.repository == 'Anuken/Mindustry' }}
run: | run: |

2
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -255,7 +255,7 @@ public class Conveyor extends Block implements Autotiler{
} }
public boolean pass(Item item){ 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); next.handleItem(this, item);
return true; return true;
} }