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

Remove preemtive unload

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-03-05 20:09:09 +01:00
parent 14a97976cc
commit e67667e4a3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/world/blocks/distribution/CraterConveyor.java
View File

@@ -159,8 +159,10 @@ public class CraterConveyor extends Block implements Autotiler{
return; return;
} }
if(entity.reload > 0f) return;
// unload // unload
if(entity.reload < 0.25f && entity.blendbit2 == 6 && entity.from != tile.pos()){ if(entity.blendbit2 == 6 && entity.from != tile.pos()){
while(true) if(!tryDump(tile)) break; // unload as much as possible while(true) if(!tryDump(tile)) break; // unload as much as possible
if(entity.items.total() == 0) poofOut(tile); if(entity.items.total() == 0) poofOut(tile);
} }
@@ -168,7 +170,7 @@ public class CraterConveyor extends Block implements Autotiler{
// transfer // transfer
if(shouldLaunch(tile)){ if(shouldLaunch(tile)){
Tile destination = tile.front(); Tile destination = tile.front();
if(destination != null && destination.getTeam() == tile.getTeam() && entity.reload == 0 && destination.block() instanceof CraterConveyor){ if(destination != null && destination.getTeam() == tile.getTeam() && destination.block() instanceof CraterConveyor){
// update as to potentially make room // update as to potentially make room
destination.block().update(destination); destination.block().update(destination);