diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index b1d2c9af47..469dab4861 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -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)), () -> { }); }); diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 20947046ac..ab136b717a 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -377,6 +377,7 @@ public class Logic implements ApplicationListener{ public static void researched(Content content){ if(!(content instanceof UnlockableContent u)) return; + //TODO node is wrong for shared tech nodes var node = u.techNode; //unlock all direct dependencies on client, permanently diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java index a6ae61edfe..e0b303c09e 100644 --- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java +++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java @@ -15,7 +15,7 @@ public class ArmoredConduit extends Conduit{ @Override 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)) || - (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasLiquids); + (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasLiquids) || otherblock instanceof LiquidJunction; } public class ArmoredConduitBuild extends ConduitBuild{