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

Fixed #11690

Browse Source
This commit is contained in:
Anuken
2026-02-18 21:43:25 -05:00
parent 50f6b1675e
commit 4fcb89cb28
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ai/types/CommandAI.java
View File

@@ -214,7 +214,9 @@ public class CommandAI extends AIController{
}
}
if(!net.client() && command == UnitCommand.enterPayloadCommand && unit.buildOn() != null && (targetPos == null || (world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y) == unit.buildOn()))){
if(!net.client() && command == UnitCommand.enterPayloadCommand && unit.type.allowedInPayloads && unit.buildOn() != null &&
(targetPos == null || (world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y) == unit.buildOn()))){
var build = unit.buildOn();
tmpPayload.unit = unit;
if(build.team == unit.team && build.acceptPayload(build, tmpPayload)){

6
core/src/mindustry/type/UnitType.java
View File

@@ -1066,7 +1066,11 @@ public class UnitType extends UnlockableContent implements Senseable{
//assign default commands.
if(commands.size == 0){
commands.add(UnitCommand.moveCommand, UnitCommand.enterPayloadCommand);
commands.add(UnitCommand.moveCommand);
if(allowedInPayloads){
commands.add(UnitCommand.enterPayloadCommand);
}
if(canBoost){
commands.add(UnitCommand.boostCommand);

2
gradle.properties
View File

@@ -26,4 +26,4 @@ org.gradle.caching=true
org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000
android.enableR8.fullMode=false
archash=505f62e674
archash=b6926f1d27