diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index e85d9b30a8..eeadcd158e 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -272,11 +272,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, //region utility methods public boolean isDiscovered(Team viewer){ - if(state.rules.borderDarkness && world.getDarkness(tile.x, tile.y) >= 3){ + if(state.rules.limitMapArea && world.getDarkness(tile.x, tile.y) >= 3){ return false; } - if(viewer == null) return true; + if(viewer == null || !state.rules.staticFog || !state.rules.fog){ + return true; + } if(block.size <= 2){ return fogControl.isDiscovered(viewer, tile.x, tile.y); }else{ diff --git a/core/src/mindustry/game/FogControl.java b/core/src/mindustry/game/FogControl.java index 4c7cb776df..0753b44ee8 100644 --- a/core/src/mindustry/game/FogControl.java +++ b/core/src/mindustry/game/FogControl.java @@ -101,7 +101,7 @@ public final class FogControl implements CustomChunk{ } public boolean isDiscovered(Team team, int x, int y){ - if(!state.rules.staticFog || team == null || team.isAI()) return true; + if(!state.rules.staticFog || !state.rules.fog || team == null || team.isAI()) return true; var data = getDiscovered(team); if(data == null) return false; diff --git a/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java b/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java index 62d12a7db5..d7a2e02c0d 100644 --- a/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java +++ b/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java @@ -34,11 +34,6 @@ public class UnitCargoUnloadPoint extends Block{ configClear((UnitCargoUnloadPointBuild build) -> build.item = null); } - @Override - public boolean outputsItems(){ - return false; - } - public class UnitCargoUnloadPointBuild extends Building{ public Item item; public float staleTimer;