diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index bee18afeea..8da34f1240 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -167,7 +167,7 @@ public class Renderer implements ApplicationListener{ laserOpacity = settings.getInt("lasersopacity") / 100f; bridgeOpacity = settings.getInt("bridgeopacity") / 100f; animateShields = settings.getBool("animatedshields"); - animateWater = settings.getBool("animatewater"); + animateWater = settings.getBool("animatedwater"); drawStatus = settings.getBool("blockstatus"); enableEffects = settings.getBool("effects"); drawDisplays = !settings.getBool("hidedisplays"); diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index 4aa04be99d..3166ba29f7 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -163,8 +163,16 @@ public class Team implements Comparable, Senseable{ @Override public double sense(LAccess sensor){ - if(sensor == LAccess.id) return id; - if(sensor == LAccess.color) return color.toDoubleBits(); - return Double.NaN; + return switch(sensor){ + case id -> id; + case color -> color.toDoubleBits(); + default -> Double.NaN; + }; + } + + @Override + public Object senseObject(LAccess sensor){ + if(sensor == LAccess.name) return name; + return null; } } diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index f970fd7b10..a7fce64cd2 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -1392,7 +1392,6 @@ public class LExecutor{ Tile tile = world.tile(x.numi(), y.numi()); if(tile != null && block.obj() instanceof Block b){ - //TODO this can be quite laggy... switch(layer){ case ore -> { if((b instanceof OverlayFloor || b == Blocks.air) && tile.overlay() != b) tile.setOverlayNet(b);