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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-06-23 12:19:20 -04:00
parent b3cdec91b8 289889a685
commit 40828a9ccc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -615,7 +615,7 @@ public class LExecutor{
toVar.isobj = value.isobj; toVar.isobj = value.isobj;
} }
}else if(from instanceof CanvasBuild canvas && (exec.privileged || (from.team == exec.team))){ }else if(from instanceof CanvasBuild canvas && (exec.privileged || (from.team == exec.team))){
canvas.setPixel(address, (int)(value.numval)); canvas.setPixel(address, value.numi());
} }
} }
} }

4
core/src/mindustry/world/blocks/logic/CanvasBlock.java
View File

@@ -167,11 +167,11 @@ public class CanvasBlock extends Block{
} }
} }
public int getPixel(int pos){ public double getPixel(int pos){
if(pos >= 0 && pos < canvasSize * canvasSize){ if(pos >= 0 && pos < canvasSize * canvasSize){
return getByte(data, pos * bitsPerPixel); return getByte(data, pos * bitsPerPixel);
} }
return 0; return Double.NaN;
} }
public int getPixel(int x, int y){ public int getPixel(int x, int y){