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

Fixed #7804 / Fixed #7803

Browse Source
This commit is contained in:
Anuken
2022-11-03 08:57:15 -04:00
parent d1f7fce7f9
commit 7e0a6b985c
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -272,11 +272,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
//region utility methods //region utility methods
public boolean isDiscovered(Team viewer){ 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; return false;
} }
if(viewer == null) return true; if(viewer == null || !state.rules.staticFog || !state.rules.fog){
return true;
}
if(block.size <= 2){ if(block.size <= 2){
return fogControl.isDiscovered(viewer, tile.x, tile.y); return fogControl.isDiscovered(viewer, tile.x, tile.y);
}else{ }else{

2
core/src/mindustry/game/FogControl.java
View File

@@ -101,7 +101,7 @@ public final class FogControl implements CustomChunk{
} }
public boolean isDiscovered(Team team, int x, int y){ 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); var data = getDiscovered(team);
if(data == null) return false; if(data == null) return false;

5
core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java
View File

@@ -34,11 +34,6 @@ public class UnitCargoUnloadPoint extends Block{
configClear((UnitCargoUnloadPointBuild build) -> build.item = null); configClear((UnitCargoUnloadPointBuild build) -> build.item = null);
} }
@Override
public boolean outputsItems(){
return false;
}
public class UnitCargoUnloadPointBuild extends Building{ public class UnitCargoUnloadPointBuild extends Building{
public Item item; public Item item;
public float staleTimer; public float staleTimer;