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

Misc bugfixes

Browse Source
This commit is contained in:
Anuken
2022-06-13 23:23:45 -04:00
parent f5b38ccbba
commit ce27388fad
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ public final class FogControl implements CustomChunk{
//all old buildings have static light scheduled around them //all old buildings have static light scheduled around them
if(state.rules.fog && state.rules.staticFog){ if(state.rules.fog && state.rules.staticFog){
pushStaticBlocks(); pushStaticBlocks(true);
//force draw all static stuff immediately //force draw all static stuff immediately
updateStatic(); updateStatic();
@@ -70,7 +70,7 @@ public final class FogControl implements CustomChunk{
if(state.rules.staticFog){ if(state.rules.staticFog){
synchronized(staticEvents){ synchronized(staticEvents){
//TODO event per team? //TODO event per team?
pushEvent(FogEvent.get(event.tile.x, event.tile.y, Mathf.round(event.tile.build.fogRadius()), event.tile.build.team.id)); pushEvent(FogEvent.get(event.tile.x, event.tile.y, Mathf.round(event.tile.build.fogRadius()), event.tile.build.team.id), false);
} }
} }
} }
@@ -146,7 +146,8 @@ public final class FogControl implements CustomChunk{
} }
} }
void pushStaticBlocks(){ /** @param initial whether this is the initial update; if true, does not update renderer */
void pushStaticBlocks(boolean initial){
if(fog == null) fog = new FogData[256]; if(fog == null) fog = new FogData[256];
synchronized(staticEvents){ synchronized(staticEvents){
@@ -156,17 +157,18 @@ public final class FogControl implements CustomChunk{
fog[build.team.id] = new FogData(); fog[build.team.id] = new FogData();
} }
pushEvent(FogEvent.get(build.tile.x, build.tile.y, Mathf.round(build.fogRadius()), build.team.id)); pushEvent(FogEvent.get(build.tile.x, build.tile.y, Mathf.round(build.fogRadius()), build.team.id), initial);
} }
} }
} }
} }
void pushEvent(long event){ /** @param skipRender whether the event is passed to the fog renderer */
void pushEvent(long event, boolean skipRender){
if(!state.rules.staticFog) return; if(!state.rules.staticFog) return;
staticEvents.add(event); staticEvents.add(event);
if(!headless && FogEvent.team(event) == Vars.player.team().id){ if(!skipRender && !headless && FogEvent.team(event) == Vars.player.team().id){
renderer.fog.handleEvent(event); renderer.fog.handleEvent(event);
} }
} }
@@ -177,7 +179,7 @@ public final class FogControl implements CustomChunk{
if(state.rules.staticFog){ if(state.rules.staticFog){
synchronized(staticEvents){ synchronized(staticEvents){
pushEvent(FogEvent.get(build.tile.x, build.tile.y, Mathf.round(build.fogRadius()), build.team.id)); pushEvent(FogEvent.get(build.tile.x, build.tile.y, Mathf.round(build.fogRadius()), build.team.id), false);
} }
} }
} }
@@ -190,7 +192,7 @@ public final class FogControl implements CustomChunk{
//force update static //force update static
if(state.rules.staticFog && !loadedStatic){ if(state.rules.staticFog && !loadedStatic){
pushStaticBlocks(); pushStaticBlocks(false);
updateStatic(); updateStatic();
loadedStatic = true; loadedStatic = true;
} }
@@ -235,7 +237,7 @@ public final class FogControl implements CustomChunk{
unitEventQueue.add(event); unitEventQueue.add(event);
if(unit.lastFogPos != pos){ if(unit.lastFogPos != pos){
pushEvent(event); pushEvent(event, false);
unit.lastFogPos = pos; unit.lastFogPos = pos;
data.dynamicUpdated = true; data.dynamicUpdated = true;
} }

2
core/src/mindustry/logic/LExecutor.java
View File

@@ -350,7 +350,7 @@ public class LExecutor{
/** Checks is a unit is valid for logic AI control, and returns the controller. */ /** Checks is a unit is valid for logic AI control, and returns the controller. */
@Nullable @Nullable
public static LogicAI checkLogicAI(LExecutor exec, Object unitObj){ public static LogicAI checkLogicAI(LExecutor exec, Object unitObj){
if(unitObj instanceof Unit unit && unit.isValid() && exec.obj(varUnit) == unit && unit.team == exec.team && !unit.isPlayer() && !(unit.isCommandable() && unit.command().hasCommand())){ if(unitObj instanceof Unit unit && unit.isValid() && exec.obj(varUnit) == unit && (unit.team == exec.team || exec.privileged) && !unit.isPlayer() && !(unit.isCommandable() && unit.command().hasCommand())){
if(unit.controller() instanceof LogicAI la){ if(unit.controller() instanceof LogicAI la){
la.controller = exec.building(varThis); la.controller = exec.building(varThis);
return la; return la;