mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-12 19:09:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #7733

Browse Source
This commit is contained in:
Anuken 2022-10-16 21:47:22 -04:00
parent 8030caea76
commit d644cbd93e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/ErekirTechTree.java
View File

@ -393,7 +393,7 @@ public class ErekirTechTree{
}); });
}); });
node(peaks, Seq.with(new SectorComplete(marsh), new SectorComplete(split)), () ->{ node(peaks, Seq.with(new SectorComplete(marsh), new SectorComplete(split)), () -> {
}); });
}); });

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

@ -377,6 +377,7 @@ public class Logic implements ApplicationListener{
public static void researched(Content content){ public static void researched(Content content){
if(!(content instanceof UnlockableContent u)) return; if(!(content instanceof UnlockableContent u)) return;
//TODO node is wrong for shared tech nodes
var node = u.techNode; var node = u.techNode;
//unlock all direct dependencies on client, permanently //unlock all direct dependencies on client, permanently

2
core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
View File

@ -15,7 +15,7 @@ public class ArmoredConduit extends Conduit{
@Override @Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
return (otherblock.outputsLiquid && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) || return (otherblock.outputsLiquid && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) ||
(lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasLiquids); (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasLiquids) || otherblock instanceof LiquidJunction;
} }
public class ArmoredConduitBuild extends ConduitBuild{ public class ArmoredConduitBuild extends ConduitBuild{