Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2025-06-23 12:19:20 -04:00
2 changed files with 3 additions and 3 deletions

View File

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

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){
return getByte(data, pos * bitsPerPixel);
}
return 0;
return Double.NaN;
}
public int getPixel(int x, int y){