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

Clean up transfer code

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-03-06 09:34:09 +01:00
parent e05f755a4e
commit 11fc494284
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,27 +169,23 @@ public class CraterConveyor extends Block implements Autotiler{
if(shouldLaunch(tile)){ if(shouldLaunch(tile)){
Tile destination = tile.front(); Tile destination = tile.front();
if(destination != null && destination.getTeam() == tile.getTeam() && destination.block() instanceof CraterConveyor){ if(destination != null && destination.getTeam() == tile.getTeam() && destination.block() instanceof CraterConveyor){
// update as to potentially make room
// always let destination update first
destination.block().update(destination); destination.block().update(destination);
CraterConveyorEntity e = destination.ent();
CraterConveyorEntity other = destination.ent(); // sleep if its occupied
if(e.from != Pos.invalid){
// check if other is occupied
if(other.from != Pos.invalid){
entity.sleep(); entity.sleep();
}else{ }else{
// transfer crater ownership e.items.addAll(entity.items);
other.from = tile.pos(); e.from = tile.pos();
// ▲ new | old ▼
entity.from = Pos.invalid; entity.from = Pos.invalid;
other.reload = 1; // start reeling in
entity.reload = 1; // prevent spawning
// transfer inventory of conveyor
other.items.addAll(entity.items);
entity.items.clear(); entity.items.clear();
other.noSleep(); e.reload = entity.reload = 1;
e.noSleep();
bump(tile); bump(tile);
} }
} }
@@ -276,7 +272,7 @@ public class CraterConveyor extends Block implements Autotiler{
if( entity.blendbit1 == 0 // 1 input from the back, 0 from the sides if( entity.blendbit1 == 0 // 1 input from the back, 0 from the sides
|| entity.blendbit1 == 2 // 1 input from the back, 1 from the sides || entity.blendbit1 == 2 // 1 input from the back, 1 from the sides
|| entity.blendbit1 == 3 // 1 input from the back, 2 from the sides || entity.blendbit1 == 3 // 1 input from the back, 2 from the sides
) cons.get(tile.back()); ) cons.get(tile.back()); // fixme, fires for 0 while nothing behind
if( entity.blendbit1 == 3 // 1 input from the back, 2 from the sides if( entity.blendbit1 == 3 // 1 input from the back, 2 from the sides
|| entity.blendbit1 == 4 // 0 input from the back, 2 from the sides || entity.blendbit1 == 4 // 0 input from the back, 2 from the sides