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
2023-01-07 13:15:59 -05:00
parent 246591eab4 eb0481a1da
commit c37ad9210a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ai/types/CargoAI.java
+2 -2
View File
@@ -60,8 +60,8 @@ public class CargoAI extends AIController{
} }
}else{ }else{
//what if some prankster reconfigures the source while the unit is moving? we can't have that! //what if some prankster reconfigures or picks up the target while the unit is moving? we can't have that!
if(unloadTarget.item != itemTarget){ if(unloadTarget.item != itemTarget || unloadTarget.isPayload()){
unloadTarget = null; unloadTarget = null;
return; return;
} }
core/src/mindustry/entities/units/AIController.java
+2 -2
View File
@@ -315,8 +315,8 @@ public class AIController implements UnitController{
vec.setLength(unit.speed() * length); vec.setLength(unit.speed() * length);
} }
//do not move when infinite vectors are used. //do not move when infinite vectors are used or if its zero.
if(vec.isNaN() || vec.isInfinite()) return; if(vec.isNaN() || vec.isInfinite() || vec.isZero()) return;
if(!unit.type.omniMovement && unit.type.rotateMoveFirst){ if(!unit.type.omniMovement && unit.type.rotateMoveFirst){
float angle = vec.angle(); float angle = vec.angle();