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

Merge branch 'master' of https://github.com/Anuken/Mindustry into crux-floor

Browse Source
This commit is contained in:
Anuken
2025-07-10 16:45:45 -04:00
parent 95e13f99a1 3cacc3c8c6
commit 0bd404eb4f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/mindustry/world/blocks/units/UnitAssembler.java
View File

@@ -509,13 +509,18 @@ public class UnitAssembler extends PayloadBlock{
Vec2 spawn = getUnitSpawn(); Vec2 spawn = getUnitSpawn();
consume(); consume();
if(!net.client()){ var unit = plan.unit.create(team);
var unit = plan.unit.create(team); if(unit.isCommandable() && commandPos != null){
if(unit != null && unit.isCommandable() && commandPos != null){ unit.command().commandPosition(commandPos);
unit.command().commandPosition(commandPos); }
} unit.set(spawn.x + Mathf.range(0.001f), spawn.y + Mathf.range(0.001f));
unit.set(spawn.x + Mathf.range(0.001f), spawn.y + Mathf.range(0.001f)); unit.rotation = rotdeg();
unit.rotation = rotdeg(); var targetBuild = unit.buildOn();
//'source' is the target build instead of this building; this is because some blocks only accept things from certain angles, and this is a non-standard payload
var payload = new UnitPayload(unit);
if(targetBuild != null && targetBuild.team == team && targetBuild.acceptPayload(targetBuild, payload)){
targetBuild.handlePayload(targetBuild, payload);
}else if(!net.client()){
unit.add(); unit.add();
Units.notifyUnitSpawn(unit); Units.notifyUnitSpawn(unit);
} }