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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-07-31 09:51:03 -04:00
parent a4ddf90ef5
commit 658079fab6
10 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/core/Control.java
View File

@@ -434,6 +434,7 @@ public class Control implements ApplicationListener, Loadable{
ui.showStartupInfo("[accent]v6[] is currently in [accent]pre-alpha[].\n" +
"[lightgray]This means:[]\n" +
"- Content is missing\n" +
"- [scarlet]Mobile[] is not supported.\n" +
"- Most [scarlet]Unit AI[] does not work\n" +
"- Many units are [scarlet]missing[] or unfinished\n" +
"- The campaign is completely unfinished\n" +

10
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -318,7 +318,7 @@ public class ItemBridge extends Block{
@Override
public boolean acceptItem(Building source, Item item){
if(team != source.team()) return false;
if(team != source.team) return false;
Tile other = world.tile(link);
@@ -328,7 +328,7 @@ public class ItemBridge extends Block{
if(rel == rel2) return false;
}else{
return source.block() instanceof ItemBridge && linkValid(source.tile(), tile) && items.total() < itemCapacity;
return linked(source) && items.total() < itemCapacity;
}
return items.total() < itemCapacity;
@@ -350,13 +350,17 @@ public class ItemBridge extends Block{
int rel2 = relativeTo(Edges.getFacingEdge(source, this));
if(rel == rel2) return false;
}else if(!(source.block() instanceof ItemBridge && linkValid(source.tile(), tile))){
}else if(!(linked(source))){
return false;
}
return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f);
}
private boolean linked(Building source){
return source instanceof ItemBridgeEntity && linkValid(source.tile(), tile) && ((ItemBridgeEntity)source).link == pos();
}
@Override
public boolean canDump(Building to, Item item){
return checkDump(to);